summaryrefslogtreecommitdiff
path: root/static/js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2012-07-19 11:53:42 -0400
committerJules Laplace <jules@okfoc.us>2012-07-19 11:53:42 -0400
commit5870aa885979b77e7390d38e1201666064fbf213 (patch)
treee5f8c68cf308e4ce39d232e0d5d38ede5e67f126 /static/js
parent01301d17b172777e154efabf2cdf8a6fdcd11f8c (diff)
ifEnter to add manual fave
Diffstat (limited to 'static/js')
-rw-r--r--static/js/pichat2.js6
-rw-r--r--static/js/src/palette-manual.js6
2 files changed, 12 insertions, 0 deletions
diff --git a/static/js/pichat2.js b/static/js/pichat2.js
index fbbbbef..421a44f 100644
--- a/static/js/pichat2.js
+++ b/static/js/pichat2.js
@@ -1247,6 +1247,11 @@ function setupUpload(elementId, roomKey) {
// manual fave palette by ohgod
$(function(){
$('#manual-palette-button').click(manPaletteToggle);
+ $('#manual-add-url-txt').keyup(ifEnter(function(){
+ addManualFav($('#manual-add-url-txt').val().trim());
+ $('#manual-add-url-txt').val("");
+ });
+/*
$('#manual-add-button').click(function () {
addManualFav($('#manual-add-url-txt').val().trim());
$('#manual-add-url-txt').val("");
@@ -1255,6 +1260,7 @@ $(function(){
removeManualFav($('#manual-add-url-txt').val().trim());
$('#manual-add-url-txt').val("");
});
+*/
});
var manPaletteOpen = false;
diff --git a/static/js/src/palette-manual.js b/static/js/src/palette-manual.js
index dbf0b89..0310fea 100644
--- a/static/js/src/palette-manual.js
+++ b/static/js/src/palette-manual.js
@@ -1,6 +1,11 @@
// manual fave palette by ohgod
$(function(){
$('#manual-palette-button').click(manPaletteToggle);
+ $('#manual-add-url-txt').keyup(ifEnter(function(){
+ addManualFav($('#manual-add-url-txt').val().trim());
+ $('#manual-add-url-txt').val("");
+ });
+/*
$('#manual-add-button').click(function () {
addManualFav($('#manual-add-url-txt').val().trim());
$('#manual-add-url-txt').val("");
@@ -9,6 +14,7 @@ $(function(){
removeManualFav($('#manual-add-url-txt').val().trim());
$('#manual-add-url-txt').val("");
});
+*/
});
var manPaletteOpen = false;