From 8a25d1ad068b67914ae87159e062c28433a3a789 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 18 Jul 2013 18:41:01 +0200 Subject: remove unnecessary tipsy for Files delete --- core/js/js.js | 1 - 1 file changed, 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 5158b66d73a..6558adbb6a7 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -664,7 +664,6 @@ $(document).ready(function(){ $('.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}); $('#headerSize').tipsy({gravity:'s', fade:true, live:true}); $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); -- cgit v1.2.3 From ff67f115d403d13dedf77457c539963f50a80eec Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Thu, 8 Aug 2013 13:50:04 +0200 Subject: fix #2711 using a custom event, also use css selectors over filterAttr --- apps/files/js/fileactions.js | 5 +++-- apps/files_sharing/js/share.js | 7 +++++-- core/js/share.js | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index aa66a57a7b5..de67d13559e 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -65,7 +65,7 @@ var FileActions = { FileActions.currentFile = parent; var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions()); var file = FileActions.getCurrentFile(); - if ($('tr').filterAttr('data-file', file).data('renaming')) { + if ($('tr[data-file="'+file+'"]').data('renaming')) { return; } parent.children('a.name').append(''); @@ -164,10 +164,11 @@ $(document).ready(function () { window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val()); }); } - $('#fileList tr').each(function () { FileActions.display($(this).children('td.filename')); }); + + $('#fileList').trigger(jQuery.Event("fileActionsReady")); }); diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index eb5a6e8cb7f..b2efafde4e7 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -4,6 +4,10 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) { + $('#fileList').one('fileActionsReady',function(){ + OC.Share.loadIcons('file'); + }); + FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { var item = $('#dir').val() + filename; @@ -33,6 +37,5 @@ $(document).ready(function() { OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions); } }); - OC.Share.loadIcons('file'); } -}); +}); \ No newline at end of file diff --git a/core/js/share.js b/core/js/share.js index b4b5159b0b5..b0d38c45cb8 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')) { -- cgit v1.2.3 From 5fb7aab7a07d05a7d05c7f0dbb5dacf33d401383 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 15 Aug 2013 13:05:26 +0200 Subject: remove jPlayer css rules from core css file --- core/css/styles.css | 7 +++---- core/js/js.js | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'core/js') diff --git a/core/css/styles.css b/core/css/styles.css index cf58a3b5f3f..1b58899eef6 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -45,7 +45,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea, select, button, .button, -#quota, div.jp-progress, .pager li a { +#quota, .pager li a { width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; background:#fff; color:#333; border:1px solid #ddd; outline:none; @@ -85,7 +85,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# /* BUTTONS */ input[type="submit"], input[type="button"], button, .button, -#quota, div.jp-progress, select, .pager li a { +#quota, select, .pager li a { width:auto; padding:.4em; background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer; -moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; @@ -545,7 +545,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; } .personalblock > legend, th, dt, label { font-weight:bold; } code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; } -#quota div, div.jp-play-bar, div.jp-seek-bar { +#quota div { padding: 0; background-color: rgb(220,220,220); font-weight: normal; @@ -553,7 +553,6 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono -moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; } #quotatext {padding:.6em 1em;} -div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } .pager li { display:inline-block; } diff --git a/core/js/js.js b/core/js/js.js index 4dfe4d0e5ee..60a29342f26 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -758,8 +758,6 @@ $(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}); -- cgit v1.2.3 From 2ee8425295affcc5a5632d2f7ea17c66e539b3be Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 17 Aug 2013 12:07:58 +0200 Subject: Remove cancel button from filepicker Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right. --- core/js/oc-dialogs.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'core/js') 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({ -- cgit v1.2.3 From 15c9a0f405631c937a935ba781b1c73a7db82556 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Sat, 17 Aug 2013 19:24:06 +0200 Subject: fixing undefined js error --- core/js/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index c2b81ae3272..75a2b51a43f 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+"]"); } } } -- cgit v1.2.3 From 9e8a6b704d4b65bb999d992f4900a9e184d952bd Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 18 Aug 2013 11:02:08 +0200 Subject: Add _many_ newlines at the end of files --- AUTHORS | 2 +- COPYING-README | 2 +- apps/files/ajax/rename.php | 2 +- apps/files/appinfo/routes.php | 2 +- apps/files/js/keyboardshortcuts.js | 2 +- apps/files/lib/app.php | 2 +- apps/files/lib/capabilities.php | 2 +- apps/files/tests/ajax_rename.php | 2 +- apps/files_encryption/ajax/changeRecoveryPassword.php | 2 +- apps/files_encryption/ajax/updatePrivateKeyPassword.php | 2 +- apps/files_encryption/ajax/userrecovery.php | 2 +- apps/files_encryption/appinfo/routes.php | 2 +- apps/files_encryption/css/settings-personal.css | 2 +- apps/files_encryption/js/settings-admin.js | 2 +- apps/files_encryption/js/settings-personal.js | 2 +- apps/files_encryption/lib/capabilities.php | 2 +- apps/files_encryption/lib/keymanager.php | 2 +- apps/files_encryption/tests/stream.php | 2 +- apps/files_encryption/tests/trashbin.php | 2 +- apps/files_encryption/tests/webdav.php | 2 +- apps/files_external/ajax/addMountPoint.php | 2 +- apps/files_external/ajax/google.php | 2 +- apps/files_external/js/google.js | 2 +- apps/files_external/lib/google.php | 2 +- apps/files_external/tests/google.php | 2 +- apps/files_sharing/appinfo/app.php | 2 +- apps/files_sharing/js/share.js | 2 +- apps/files_sharing/lib/cache.php | 2 +- apps/files_sharing/lib/permissions.php | 2 +- apps/files_sharing/lib/watcher.php | 2 +- apps/files_sharing/templates/part.404.php | 2 +- apps/files_trashbin/appinfo/app.php | 2 +- apps/files_trashbin/appinfo/update.php | 2 +- apps/files_trashbin/js/disableDefaultActions.js | 2 +- apps/files_versions/appinfo/routes.php | 2 +- apps/files_versions/lib/capabilities.php | 2 +- apps/user_ldap/ajax/clearMappings.php | 2 +- apps/user_ldap/ajax/getConfiguration.php | 2 +- apps/user_ldap/ajax/getNewServerConfigPrefix.php | 2 +- apps/user_ldap/ajax/setConfiguration.php | 2 +- apps/user_ldap/css/settings.css | 2 +- apps/user_ldap/group_proxy.php | 2 +- apps/user_ldap/js/settings.js | 2 +- apps/user_ldap/lib/proxy.php | 2 +- apps/user_ldap/user_proxy.php | 2 +- core/css/auth.css | 2 +- core/js/jquery.infieldlabel.js | 2 +- core/js/jquery.inview.js | 2 +- core/js/oc-requesttoken.js | 2 +- core/js/visitortimezone.js | 2 +- core/lostpassword/templates/email.php | 2 +- core/routes.php | 2 +- cron.php | 2 +- lib/files/storage/commontest.php | 2 +- lib/geo.php | 2 +- lib/ocs/result.php | 2 +- lib/public/groupinterface.php | 2 +- lib/public/userinterface.php | 2 +- lib/user/http.php | 2 +- lib/user/interface.php | 2 +- lib/vobject/compoundproperty.php | 2 +- lib/vobject/stringproperty.php | 2 +- ocs/routes.php | 2 +- public.php | 2 +- remote.php | 2 +- search/css/results.css | 2 +- settings/ajax/setsecurity.php | 2 +- settings/ajax/updateapp.php | 2 +- settings/js/apps-custom.php | 2 +- settings/js/isadmin.php | 2 +- status.php | 2 +- tests/lib/app.php | 2 +- tests/lib/archive/zip.php | 2 +- tests/lib/geo.php | 2 +- tests/lib/vobject.php | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) (limited to 'core/js') diff --git a/AUTHORS b/AUTHORS index c30a6bf426b..7e0d8f6587b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -28,4 +28,4 @@ With help from many libraries and frameworks including: … "Lock” symbol from thenounproject.com collection -"Clock” symbol by Brandon Hopkins, from thenounproject.com collection \ No newline at end of file +"Clock” symbol by Brandon Hopkins, from thenounproject.com collection diff --git a/COPYING-README b/COPYING-README index 49e035186ed..8c26709d767 100644 --- a/COPYING-README +++ b/COPYING-README @@ -12,4 +12,4 @@ Licensing of components: All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files. -Attribution information for ownCloud is contained in the AUTHORS file. \ No newline at end of file +Attribution information for ownCloud is contained in the AUTHORS file. diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index f4551858283..5b07c306af8 100644 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -38,4 +38,4 @@ if($result['success'] === true){ OCP\JSON::success(array('data' => $result['data'])); } else { OCP\JSON::error(array('data' => $result['data'])); -} \ No newline at end of file +} diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php index fcd5f4b2608..f3d8e9a4f4d 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -11,4 +11,4 @@ $this->create('download', 'download{file}') ->actionInclude('files/download.php'); // Register with the capabilities API -OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH); diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index cc2b5d42139..418c38adb99 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -165,4 +165,4 @@ var Files = Files || {}; removeA(keys, event.keyCode); }); }; -})(Files); \ No newline at end of file +})(Files); diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php index f7052ef80b0..579e8676cfc 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/app.php @@ -76,4 +76,4 @@ class App { return $result; } -} \ No newline at end of file +} diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/capabilities.php index 90a5e2f4eb9..d4820e931ba 100644 --- a/apps/files/lib/capabilities.php +++ b/apps/files/lib/capabilities.php @@ -21,4 +21,4 @@ class Capabilities { )); } -} \ No newline at end of file +} diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 2b90a11743d..8eff978cde0 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -114,4 +114,4 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { $this->assertEquals($expected, $result); } -} \ No newline at end of file +} diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php index 366f634a51c..945f054ea84 100644 --- a/apps/files_encryption/ajax/changeRecoveryPassword.php +++ b/apps/files_encryption/ajax/changeRecoveryPassword.php @@ -49,4 +49,4 @@ if ($return) { \OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.')))); } else { \OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.')))); -} \ No newline at end of file +} diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php index 6fd63dae9cd..1e6644da576 100644 --- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php +++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php @@ -51,4 +51,4 @@ if ($return) { \OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.')))); } else { \OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.')))); -} \ No newline at end of file +} diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php index 1d0f1ac2d17..d6c94bde81e 100644 --- a/apps/files_encryption/ajax/userrecovery.php +++ b/apps/files_encryption/ajax/userrecovery.php @@ -38,4 +38,4 @@ if ( } // Return success or failure -($return) ? \OCP\JSON::success() : \OCP\JSON::error(); \ No newline at end of file +($return) ? \OCP\JSON::success() : \OCP\JSON::error(); diff --git a/apps/files_encryption/appinfo/routes.php b/apps/files_encryption/appinfo/routes.php index ab83432a4b2..07ff920a60d 100644 --- a/apps/files_encryption/appinfo/routes.php +++ b/apps/files_encryption/appinfo/routes.php @@ -6,4 +6,4 @@ */ // Register with the capabilities API -OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH); diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css index 4ee0acc9768..8eb5bedcb06 100644 --- a/apps/files_encryption/css/settings-personal.css +++ b/apps/files_encryption/css/settings-personal.css @@ -7,4 +7,4 @@ , #recoveryEnabledError , #recoveryEnabledSuccess { display: none; -} \ No newline at end of file +} diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js index 7c1866445ee..6647c621e7b 100644 --- a/apps/files_encryption/js/settings-admin.js +++ b/apps/files_encryption/js/settings-admin.js @@ -99,4 +99,4 @@ $(document).ready(function(){ ); }); -}); \ No newline at end of file +}); diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js index d6535a25b70..e16519c3c98 100644 --- a/apps/files_encryption/js/settings-personal.js +++ b/apps/files_encryption/js/settings-personal.js @@ -95,4 +95,4 @@ $(document).ready(function(){ updatePrivateKeyPasswd(); }); -}); \ No newline at end of file +}); diff --git a/apps/files_encryption/lib/capabilities.php b/apps/files_encryption/lib/capabilities.php index 72baddcd049..ef94c9e086d 100644 --- a/apps/files_encryption/lib/capabilities.php +++ b/apps/files_encryption/lib/capabilities.php @@ -20,4 +20,4 @@ class Capabilities { )); } -} \ No newline at end of file +} diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index b2fd650f18d..5386de486e1 100755 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -593,4 +593,4 @@ class Keymanager { return $targetPath; } -} \ No newline at end of file +} diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 50ac41e4536..5193f8c9686 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -180,4 +180,4 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase { // tear down $view->unlink($filename); } -} \ No newline at end of file +} diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index ade968fbece..6c1aa2a142f 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -300,4 +300,4 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix)); } -} \ No newline at end of file +} diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index 1d406789f0c..26a002a8b34 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -259,4 +259,4 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { // return captured content return $content; } -} \ No newline at end of file +} diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php index fed2ddfcf3d..9100d47db3a 100644 --- a/apps/files_external/ajax/addMountPoint.php +++ b/apps/files_external/ajax/addMountPoint.php @@ -16,4 +16,4 @@ $status = OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['mountType'], $_POST['applicable'], $isPersonal); -OCP\JSON::success(array('data' => array('message' => $status))); \ No newline at end of file +OCP\JSON::success(array('data' => array('message' => $status))); diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php index e63b7cb07b9..2594a1780b3 100644 --- a/apps/files_external/ajax/google.php +++ b/apps/files_external/ajax/google.php @@ -39,4 +39,4 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST } } } -} \ No newline at end of file +} diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js index 7e111a95d98..b4be1c1dc41 100644 --- a/apps/files_external/js/google.js +++ b/apps/files_external/js/google.js @@ -126,4 +126,4 @@ $(document).ready(function() { } }); -}); \ No newline at end of file +}); diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index ef8dd6d8cad..e6cdacdec4f 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -587,4 +587,4 @@ class Google extends \OC\Files\Storage\Common { return false; } -} \ No newline at end of file +} diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php index 12faabb902d..d5495d49c5e 100644 --- a/apps/files_external/tests/google.php +++ b/apps/files_external/tests/google.php @@ -42,4 +42,4 @@ class Google extends Storage { $this->instance->rmdir('/'); } } -} \ No newline at end of file +} diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 9363a5431fa..895d446a336 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -15,4 +15,4 @@ OCP\Util::addScript('files_sharing', 'share'); \OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); -\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file +\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index b2efafde4e7..3be89a39fa0 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -38,4 +38,4 @@ $(document).ready(function() { } }); } -}); \ No newline at end of file +}); diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 2160fe9a393..33cd1428899 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -288,4 +288,4 @@ class Shared_Cache extends Cache { return false; } -} \ No newline at end of file +} diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php index b6638564cd8..e2978e12bfb 100644 --- a/apps/files_sharing/lib/permissions.php +++ b/apps/files_sharing/lib/permissions.php @@ -106,4 +106,4 @@ class Shared_Permissions extends Permissions { // Not a valid action for Shared Permissions } -} \ No newline at end of file +} diff --git a/apps/files_sharing/lib/watcher.php b/apps/files_sharing/lib/watcher.php index e67d1ee9086..6fdfc1db36d 100644 --- a/apps/files_sharing/lib/watcher.php +++ b/apps/files_sharing/lib/watcher.php @@ -48,4 +48,4 @@ class Shared_Watcher extends Watcher { } } -} \ No newline at end of file +} diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php index b5152e1511a..3ef117d7524 100644 --- a/apps/files_sharing/templates/part.404.php +++ b/apps/files_sharing/templates/part.404.php @@ -9,4 +9,4 @@

t('For more info, please ask the person who sent this link.')); ?>

- \ No newline at end of file + diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 3b1e0ac30cc..2c101f0a723 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -4,4 +4,4 @@ OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php'; OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php'; // register hooks -\OCA\Files_Trashbin\Trashbin::registerHooks(); \ No newline at end of file +\OCA\Files_Trashbin\Trashbin::registerHooks(); diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php index f4dad7b26bf..0ca232668d7 100644 --- a/apps/files_trashbin/appinfo/update.php +++ b/apps/files_trashbin/appinfo/update.php @@ -7,4 +7,4 @@ if (version_compare($installedVersion, '0.4', '<')) { //enforce a recalculation during next usage. $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`'); $result = $query->execute(); -} \ No newline at end of file +} diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js index df08bfb1a50..afa80cacd6b 100644 --- a/apps/files_trashbin/js/disableDefaultActions.js +++ b/apps/files_trashbin/js/disableDefaultActions.js @@ -1,4 +1,4 @@ /* disable download and sharing actions */ var disableDownloadActions = true; var disableSharing = true; -var trashBinApp = true; \ No newline at end of file +var trashBinApp = true; diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 8cef57c9e4d..38c288adf9d 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -6,4 +6,4 @@ */ // Register with the capabilities API -OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH); diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php index 3251a07b6ae..45d7dd3fb02 100644 --- a/apps/files_versions/lib/capabilities.php +++ b/apps/files_versions/lib/capabilities.php @@ -20,4 +20,4 @@ class Capabilities { )); } -} \ No newline at end of file +} diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php index 5dab39839b6..9118d58c5cf 100644 --- a/apps/user_ldap/ajax/clearMappings.php +++ b/apps/user_ldap/ajax/clearMappings.php @@ -32,4 +32,4 @@ if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) { } else { $l=OC_L10N::get('user_ldap'); OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.'))); -} \ No newline at end of file +} diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php index dfae68d2dc9..baca588976f 100644 --- a/apps/user_ldap/ajax/getConfiguration.php +++ b/apps/user_ldap/ajax/getConfiguration.php @@ -28,4 +28,4 @@ OCP\JSON::callCheck(); $prefix = $_POST['ldap_serverconfig_chooser']; $connection = new \OCA\user_ldap\lib\Connection($prefix); -OCP\JSON::success(array('configuration' => $connection->getConfiguration())); \ No newline at end of file +OCP\JSON::success(array('configuration' => $connection->getConfiguration())); diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php index 17e78f87072..1c68b2e9a76 100644 --- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php +++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php @@ -31,4 +31,4 @@ sort($serverConnections); $lk = array_pop($serverConnections); $ln = intval(str_replace('s', '', $lk)); $nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT); -OCP\JSON::success(array('configPrefix' => $nk)); \ No newline at end of file +OCP\JSON::success(array('configPrefix' => $nk)); diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php index 206487c7e0a..d850bda2470 100644 --- a/apps/user_ldap/ajax/setConfiguration.php +++ b/apps/user_ldap/ajax/setConfiguration.php @@ -30,4 +30,4 @@ $prefix = $_POST['ldap_serverconfig_chooser']; $connection = new \OCA\user_ldap\lib\Connection($prefix); $connection->setConfiguration($_POST); $connection->saveConfiguration(); -OCP\JSON::success(); \ No newline at end of file +OCP\JSON::success(); diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 185952e14bb..431e064def8 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -18,4 +18,4 @@ .ldapwarning { margin-left: 1.4em; color: #FF3B3B; -} \ No newline at end of file +} diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index 75e7cd46336..eb6f176c58c 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -198,4 +198,4 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { //it's the same across all our user backends obviously return $this->refBackend->implementsActions($actions); } -} \ No newline at end of file +} diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 52d5dbc48d9..78c9719480d 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -204,4 +204,4 @@ $(document).ready(function() { LdapConfiguration.refreshConfig(); } }); -}); \ No newline at end of file +}); diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index c80e2163475..ae3e3be7361 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -101,4 +101,4 @@ abstract class Proxy { public function clearCache() { $this->cache->clear($this->getCacheKey(null)); } -} \ No newline at end of file +} diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php index 73cc0963182..0722d8871a4 100644 --- a/apps/user_ldap/user_proxy.php +++ b/apps/user_ldap/user_proxy.php @@ -198,4 +198,4 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface { return $this->refBackend->hasUserListings(); } -} \ No newline at end of file +} diff --git a/core/css/auth.css b/core/css/auth.css index bce7fa7b711..0adc10c77d9 100644 --- a/core/css/auth.css +++ b/core/css/auth.css @@ -36,4 +36,4 @@ h2 img { font-size:1.2em; margin:.7em; padding:0; -} \ No newline at end of file +} 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/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/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 +}); diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php index b65049feffe..3dbae4bfc69 100644 --- a/core/lostpassword/templates/email.php +++ b/core/lostpassword/templates/email.php @@ -1,2 +1,2 @@ t('Use the following link to reset your password: {link}')); \ No newline at end of file +echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}')); diff --git a/core/routes.php b/core/routes.php index be19b66bf72..dd8222d4378 100644 --- a/core/routes.php +++ b/core/routes.php @@ -73,4 +73,4 @@ $this->create('app_script', '/apps/{app}/{file}') // used for heartbeat $this->create('heartbeat', '/heartbeat')->action(function(){ // do nothing -}); \ No newline at end of file +}); diff --git a/cron.php b/cron.php index fbea7f26aed..d39800c8849 100644 --- a/cron.php +++ b/cron.php @@ -121,4 +121,4 @@ try { } catch (Exception $ex) { \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL); -} \ No newline at end of file +} diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php index fbdb7fbf110..c3f1eb31955 100644 --- a/lib/files/storage/commontest.php +++ b/lib/files/storage/commontest.php @@ -77,4 +77,4 @@ class CommonTest extends \OC\Files\Storage\Common{ public function touch($path, $mtime=null) { return $this->storage->touch($path, $mtime); } -} \ No newline at end of file +} diff --git a/lib/geo.php b/lib/geo.php index 4eb785da355..ed01ad0b616 100644 --- a/lib/geo.php +++ b/lib/geo.php @@ -28,4 +28,4 @@ class OC_Geo{ reset($variances); return current($variances); } -} \ No newline at end of file +} diff --git a/lib/ocs/result.php b/lib/ocs/result.php index 729c39056d9..84f06fa01c7 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -94,4 +94,4 @@ class OC_OCS_Result{ } -} \ No newline at end of file +} diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php index 97833028118..5603faa8265 100644 --- a/lib/public/groupinterface.php +++ b/lib/public/groupinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface GroupInterface extends \OC_Group_Interface {} \ No newline at end of file +interface GroupInterface extends \OC_Group_Interface {} diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php index b73a8f8d8b0..53d9faf7a5e 100644 --- a/lib/public/userinterface.php +++ b/lib/public/userinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface UserInterface extends \OC_User_Interface {} \ No newline at end of file +interface UserInterface extends \OC_User_Interface {} diff --git a/lib/user/http.php b/lib/user/http.php index 944ede73a0b..1e044ed4188 100644 --- a/lib/user/http.php +++ b/lib/user/http.php @@ -103,4 +103,4 @@ class OC_User_HTTP extends OC_User_Backend { return false; } } -} \ No newline at end of file +} diff --git a/lib/user/interface.php b/lib/user/interface.php index b1e19aea7fb..c72bdfaf3fd 100644 --- a/lib/user/interface.php +++ b/lib/user/interface.php @@ -77,4 +77,4 @@ interface OC_User_Interface { * @return boolean if users can be listed or not */ public function hasUserListings(); -} \ No newline at end of file +} diff --git a/lib/vobject/compoundproperty.php b/lib/vobject/compoundproperty.php index d702ab802e0..7fe42574bed 100644 --- a/lib/vobject/compoundproperty.php +++ b/lib/vobject/compoundproperty.php @@ -67,4 +67,4 @@ class CompoundProperty extends \Sabre\VObject\Property\Compound { } -} \ No newline at end of file +} diff --git a/lib/vobject/stringproperty.php b/lib/vobject/stringproperty.php index b98a8f26c2b..a9d63a0a789 100644 --- a/lib/vobject/stringproperty.php +++ b/lib/vobject/stringproperty.php @@ -77,4 +77,4 @@ class StringProperty extends \Sabre\VObject\Property { } -} \ No newline at end of file +} diff --git a/ocs/routes.php b/ocs/routes.php index 5fcf05e4f99..1ea698c7a83 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -74,4 +74,4 @@ OC_API::register( array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH - ); \ No newline at end of file + ); diff --git a/public.php b/public.php index 0154b59cce3..1781632bc78 100644 --- a/public.php +++ b/public.php @@ -28,4 +28,4 @@ try { OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); OC_Template::printExceptionErrorPage($ex); -} \ No newline at end of file +} diff --git a/remote.php b/remote.php index ec0f2ecef72..2d0088cd903 100644 --- a/remote.php +++ b/remote.php @@ -46,4 +46,4 @@ try { OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); OC_Template::printExceptionErrorPage($ex); -} \ No newline at end of file +} diff --git a/search/css/results.css b/search/css/results.css index 30cc352fd7b..4ae7d67afb3 100644 --- a/search/css/results.css +++ b/search/css/results.css @@ -66,4 +66,4 @@ #searchresults tr.current { background-color:#ddd; -} \ No newline at end of file +} diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php index 16a85aade81..675d7eced47 100644 --- a/settings/ajax/setsecurity.php +++ b/settings/ajax/setsecurity.php @@ -10,4 +10,4 @@ OCP\JSON::callCheck(); OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN)); -echo 'true'; \ No newline at end of file +echo 'true'; diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 300e8642515..91c342d5d07 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -12,4 +12,4 @@ if($result !== false) { } else { $l = OC_L10N::get('settings'); OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") ))); -} \ No newline at end of file +} diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php index d827dfc7058..c25148cdde5 100644 --- a/settings/js/apps-custom.php +++ b/settings/js/apps-custom.php @@ -23,4 +23,4 @@ foreach($combinedApps as $app) { echo("\n"); } -echo ("var appid =".json_encode($_GET['appid']).";"); \ No newline at end of file +echo ("var appid =".json_encode($_GET['appid']).";"); diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php index 8b31f8a7cf9..13a8ba1d312 100644 --- a/settings/js/isadmin.php +++ b/settings/js/isadmin.php @@ -17,4 +17,4 @@ if (OC_User::isAdminUser(OC_User::getUser())) { echo("var isadmin = true;"); } else { echo("var isadmin = false;"); -} \ No newline at end of file +} diff --git a/status.php b/status.php index bac01c11b28..179fe3f49f2 100644 --- a/status.php +++ b/status.php @@ -39,4 +39,4 @@ try { } catch (Exception $ex) { OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); -} \ No newline at end of file +} diff --git a/tests/lib/app.php b/tests/lib/app.php index 5396db8143e..52eade90a6e 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -79,4 +79,4 @@ class Test_App extends PHPUnit_Framework_TestCase { $this->assertFalse(OC_App::isAppVersionCompatible($oc, $app)); } -} \ No newline at end of file +} diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index e049a899d88..195e3450f3f 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -19,4 +19,4 @@ class Test_Archive_ZIP extends Test_Archive { return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); } } -} \ No newline at end of file +} diff --git a/tests/lib/geo.php b/tests/lib/geo.php index 2c3611c092e..1c56a976129 100644 --- a/tests/lib/geo.php +++ b/tests/lib/geo.php @@ -20,4 +20,4 @@ class Test_Geo extends PHPUnit_Framework_TestCase { $expected = 'Pacific/Enderbury'; $this->assertEquals($expected, $result); } -} \ No newline at end of file +} diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php index f28d22a1fcd..db5b0f99f06 100644 --- a/tests/lib/vobject.php +++ b/tests/lib/vobject.php @@ -35,4 +35,4 @@ class Test_VObject extends PHPUnit_Framework_TestCase { $parts = $property->getParts(); $this->assertEquals('Marketing;Sales', $parts[2]); } -} \ No newline at end of file +} -- cgit v1.2.3 From 1793ec1d5dcbdf806817da1674562ef6a02b39b0 Mon Sep 17 00:00:00 2001 From: Owen Winkler Date: Sun, 18 Aug 2013 05:17:28 -0400 Subject: Fixed inconsistent spacing. --- core/js/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 75a2b51a43f..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 ["+ t.plural_forms+"]"); + console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]"); } } } -- cgit v1.2.3