diff options
author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
commit | f2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch) | |
tree | b1424be17877cbd25bf3781600d353efd3dd0759 /core/js | |
parent | 7e4dcd268f6cb6618600718a51c4d882e9027829 (diff) | |
parent | 9be836814cb4165ea54a086a0f97526d783bcd37 (diff) | |
download | nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip |
Merge master into oc_preview
Diffstat (limited to 'core/js')
-rw-r--r-- | core/js/jquery.infieldlabel.js | 2 | ||||
-rw-r--r-- | core/js/jquery.inview.js | 2 | ||||
-rw-r--r-- | core/js/js.js | 5 | ||||
-rw-r--r-- | core/js/oc-dialogs.js | 4 | ||||
-rw-r--r-- | core/js/oc-requesttoken.js | 2 | ||||
-rw-r--r-- | core/js/share.js | 6 | ||||
-rw-r--r-- | core/js/visitortimezone.js | 2 |
7 files changed, 8 insertions, 15 deletions
diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js index 8a76da1b140..fad15102bcb 100644 --- a/core/js/jquery.infieldlabel.js +++ b/core/js/jquery.infieldlabel.js @@ -174,4 +174,4 @@ }); }; -}(jQuery));
\ No newline at end of file +}(jQuery)); diff --git a/core/js/jquery.inview.js b/core/js/jquery.inview.js index 9687cd83368..511ae95415e 100644 --- a/core/js/jquery.inview.js +++ b/core/js/jquery.inview.js @@ -131,4 +131,4 @@ // By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays // intervals while the user scrolls. Therefore the inview event might fire a bit late there setInterval(checkInView, 250); -})(jQuery);
\ No newline at end of file +})(jQuery); diff --git a/core/js/js.js b/core/js/js.js index 4dfe4d0e5ee..d580b6113e6 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -69,7 +69,7 @@ function initL10N(app) { var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };'; t.plural_function = new Function("n", code); } else { - console.log("Syntax error in language file. Plural-Forms header is invalid ["+plural_forms+"]"); + console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]"); } } } @@ -758,13 +758,10 @@ $(document).ready(function(){ }); // all the tipsy stuff needs to be here (in reverse order) to work - $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); - $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); $('.displayName .action').tipsy({gravity:'se', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); - $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f4bc174b5eb..5cbc8359d52 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -117,10 +117,6 @@ var OCdialogs = { text: t('core', 'Choose'), click: functionToCall, defaultButton: true - }, - { - text: t('core', 'Cancel'), - click: function(){self.$filePicker.ocdialog('close'); } }]; self.$filePicker.ocdialog({ diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js index f4cf286b8aa..6cc6b5a855b 100644 --- a/core/js/oc-requesttoken.js +++ b/core/js/oc-requesttoken.js @@ -1,3 +1,3 @@ $(document).bind('ajaxSend', function(elm, xhr, s) { xhr.setRequestHeader('requesttoken', oc_requesttoken); -});
\ No newline at end of file +}); diff --git a/core/js/share.js b/core/js/share.js index a0ae39fffed..e7fb26d0ed8 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -22,9 +22,9 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var file = $('tr').filterAttr('data-id', item); + var file = $('tr[data-id="'+item+'"]'); if (file.length > 0) { - var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); + var action = $(file).find('.fileactions .action[data-action="Share"]'); var img = action.find('img').attr('src', image); action.addClass('permanent'); action.html(' '+t('core', 'Shared')).prepend(img); @@ -36,7 +36,7 @@ OC.Share={ // Search for possible parent folders that are shared while (path != last) { if (path == data['path']) { - var actions = $('.fileactions .action').filterAttr('data-action', 'Share'); + var actions = $('.fileactions .action[data-action="Share"]'); $.each(actions, function(index, action) { var img = $(action).find('img'); if (img.attr('src') != OC.imagePath('core', 'actions/public')) { diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js index 58a1e9ea355..ee0105c783d 100644 --- a/core/js/visitortimezone.js +++ b/core/js/visitortimezone.js @@ -1,4 +1,4 @@ $(document).ready(function () { var visitortimezone = (-new Date().getTimezoneOffset() / 60); $('#timezone-offset').val(visitortimezone); -});
\ No newline at end of file +}); |