From 8990855f88c8cf0803bcf7220699c54b46b0d546 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 29 Aug 2012 21:52:42 +0200 Subject: add OC.get and OC.set to get/set variables by name in javascript --- core/js/js.js | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index c38eebbff29..0a7c84f61da 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -587,3 +587,40 @@ function formatDate(date){ t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ]; return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } + +/** + * get a variable by name + * @param string name + */ +OC.get=function(name) { + var namespaces = name.split("."); + var tail = namespaces.pop(); + var context=window; + + for(var i = 0; i < namespaces.length; i++) { + context = context[namespaces[i]]; + if(!context){ + return false; + } + } + return context[tail]; +} + +/** + * set a variable by name + * @param string name + * @param mixed value + */ +OC.set=function(name, value) { + var namespaces = name.split("."); + var tail = namespaces.pop(); + var context=window; + + for(var i = 0; i < namespaces.length; i++) { + if(!context[namespaces[i]]){ + context[namespaces[i]]={}; + } + context = context[namespaces[i]]; + } + context[tail]=value; +} -- cgit v1.2.3 From 61a3e5f96b5019f89587e8cead63988f274d140e Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 31 Aug 2012 00:59:10 +0200 Subject: unify permissions (1/3): add permission conastants to javascript OC --- core/js/js.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 0a7c84f61da..7ce349a2147 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -40,6 +40,11 @@ function fileDownloadPath(dir, file) { } OC={ + PERMISSION_CREATE:4, + PERMISSION_READ:1, + PERMISSION_UPDATE:2, + PERMISSION_DELETE:8, + PERMISSION_SHARE:16, webroot:oc_webroot, appswebroots:oc_appswebroots, currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, -- cgit v1.2.3 From 3ba27e624f2c36044a982bc0cd69f07106e61e96 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 31 Aug 2012 01:05:36 +0200 Subject: unify permissions (2/3): change apps to use OC::PERMISSION_X --- apps/files/js/fileactions.js | 8 ++++---- apps/files_sharing/js/public.js | 2 +- apps/files_sharing/js/share.js | 2 +- apps/files_versions/js/versions.js | 2 +- core/js/share.js | 36 ++++++++++++++++++------------------ 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 89e7bdd7ad7..f587e99f966 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -156,12 +156,12 @@ $(document).ready(function(){ } else { var downloadScope = 'file'; } - FileActions.register(downloadScope,'Download', FileActions.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){ + FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){ window.location=OC.filePath('files', 'ajax', 'download.php') + encodeURIComponent('?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val())); }); }); -FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){ +FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){ if(Files.cancelUpload(filename)) { if(filename.substr){ filename=[filename]; @@ -179,11 +179,11 @@ FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){r $('.tipsy').remove(); }); -FileActions.register('all','Rename', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ +FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ FileList.rename(filename); }); -FileActions.register('dir','Open', FileActions.PERMISSION_READ, '', function(filename){ +FileActions.register('dir','Open', OC.PERMISSION_READ, '', function(filename){ window.location=OC.linkTo('files', 'index.php') + '&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); }); diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 1ab61d476ec..92b626bba18 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -10,7 +10,7 @@ $(document).ready(function() { // Show file preview if previewer is available, images are already handled by the template if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') { // Trigger default action if not download TODO - var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ); + var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ); if (typeof action === 'undefined') { $('#noPreview').show(); } else { diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 79ab4adebac..a171751589a 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') { OC.Share.loadIcons('file'); - FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) { + FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) { // Return the correct sharing icon if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback if ($('#dir').val() == '/') { diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index e34a6f50cac..a9cf6171e45 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -11,7 +11,7 @@ $(document).ready(function() { $(document).ready(function(){ if (typeof FileActions !== 'undefined') { // Add history button to files/index.php - FileActions.register('file','History', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){ + FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){ if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback diff --git a/core/js/share.js b/core/js/share.js index 8bfbdd36e19..f8ff6907329 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -129,7 +129,7 @@ OC.Share={ } html += '
'; } - if (possiblePermissions & OC.Share.PERMISSION_SHARE) { + if (possiblePermissions & OC.PERMISSION_SHARE) { html += ''; html += '
    '; html += '
'; @@ -187,7 +187,7 @@ OC.Share={ var shareWith = selected.item.value.shareWith; $(this).val(shareWith); // Default permissions are Read and Share - var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE; + var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE; OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() { OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions); $('#shareWith').val(''); @@ -224,24 +224,24 @@ OC.Share={ } OC.Share.itemShares[shareType].push(shareWith); var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = ''; - if (permissions & OC.Share.PERMISSION_CREATE) { + if (permissions & OC.PERMISSION_CREATE) { createChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_UPDATE) { + if (permissions & OC.PERMISSION_UPDATE) { updateChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_DELETE) { + if (permissions & OC.PERMISSION_DELETE) { deleteChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_SHARE) { + if (permissions & OC.PERMISSION_SHARE) { shareChecked = 'checked="checked"'; } var html = '
  • '; html += shareWith; - if (possiblePermissions & OC.Share.PERMISSION_CREATE || possiblePermissions & OC.Share.PERMISSION_UPDATE || possiblePermissions & OC.Share.PERMISSION_DELETE) { + if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { if (editChecked == '') { html += '
    • '; @@ -386,7 +386,7 @@ $(document).ready(function() { $(checkboxes).filter('input[name="edit"]').attr('checked', true); } } - var permissions = OC.Share.PERMISSION_READ; + var permissions = OC.PERMISSION_READ; $(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) { permissions |= $(checkbox).data('permissions'); }); @@ -398,7 +398,7 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); if (this.checked) { // Create a link - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.Share.PERMISSION_READ, function() { + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() { OC.Share.showLink(itemSource); // TODO Change icon }); @@ -423,7 +423,7 @@ $(document).ready(function() { if (event.keyCode == 13) { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ, function() { + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() { $('#linkPassText').val(''); $('#linkPassText').attr('placeholder', 'Password protected'); }); -- cgit v1.2.3 From ca8120e9f429ba088a9ff6b525ae0762fd7d4f07 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 31 Aug 2012 01:08:38 +0200 Subject: unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share --- apps/files/js/fileactions.js | 5 ----- core/js/share.js | 5 ----- 2 files changed, 10 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index f587e99f966..ea3522cb101 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -1,9 +1,4 @@ FileActions={ - PERMISSION_CREATE:4, - PERMISSION_READ:1, - PERMISSION_UPDATE:2, - PERMISSION_DELETE:8, - PERMISSION_SHARE:16, actions:{}, defaults:{}, icons:{}, diff --git a/core/js/share.js b/core/js/share.js index f8ff6907329..642c2e1fe4f 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -3,11 +3,6 @@ OC.Share={ SHARE_TYPE_GROUP:1, SHARE_TYPE_LINK:3, SHARE_TYPE_EMAIL:4, - PERMISSION_CREATE:4, - PERMISSION_READ:1, - PERMISSION_UPDATE:2, - PERMISSION_DELETE:8, - PERMISSION_SHARE:16, itemShares:[], statuses:[], droppedDown:false, -- cgit v1.2.3 From 5a9a795cd5b69d9a6acd2b82f77c9437c362d71a Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 1 Sep 2012 13:52:12 -0400 Subject: Fix check in Javascript for password protected link --- core/js/share.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/share.js b/core/js/share.js index 642c2e1fe4f..e97302b0d5a 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -277,7 +277,7 @@ OC.Share={ $('#linkText').val(link); $('#linkText').show('blind'); $('#showPassword').show(); - if (password.length > 0) { + if (password != null) { $('#linkPass').show('blind'); $('#linkPassText').attr('placeholder', 'Password protected'); } -- cgit v1.2.3 From f188f6cc2fed10bdc78a34df95b898a770bcf506 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 4 Sep 2012 21:27:04 +0200 Subject: Fix some jslint warnings --- apps/files/js/fileactions.js | 10 +++++----- apps/files/js/filelist.js | 4 ++-- core/js/js.js | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index ea3522cb101..f4e7b7723f6 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -1,4 +1,4 @@ -FileActions={ +var FileActions={ actions:{}, defaults:{}, icons:{}, @@ -20,20 +20,20 @@ FileActions={ get:function(mime,type,permissions){ var actions={}; if(FileActions.actions.all){ - actions=$.extend( actions, FileActions.actions.all ) + actions=$.extend( actions, FileActions.actions.all ); } if(mime){ if(FileActions.actions[mime]){ - actions=$.extend( actions, FileActions.actions[mime] ) + actions=$.extend( actions, FileActions.actions[mime] ); } var mimePart=mime.substr(0,mime.indexOf('/')); if(FileActions.actions[mimePart]){ - actions=$.extend( actions, FileActions.actions[mimePart] ) + actions=$.extend( actions, FileActions.actions[mimePart] ); } } if(type){//type is 'dir' or 'file' if(FileActions.actions[type]){ - actions=$.extend( actions, FileActions.actions[type] ) + actions=$.extend( actions, FileActions.actions[type] ); } } var filteredActions = {}; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e0cf516411a..85e5cfb14c2 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1,4 +1,4 @@ -FileList={ +var FileList={ useUndo:true, update:function(fileListHtml) { $('#fileList').empty().html(fileListHtml); @@ -14,7 +14,7 @@ FileList={ var extension=false; } html+=''; - html+=''+basename + html+=''+basename; if(extension){ html+=''+extension+''; } diff --git a/core/js/js.js b/core/js/js.js index 7ce349a2147..8b9ecd38dc2 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -4,6 +4,8 @@ * @param text the string to translate * @return string */ +var OC; + function t(app,text){ if( !( app in t.cache )){ $.ajax(OC.filePath('core','ajax','translations.php'),{ -- cgit v1.2.3 From 9329af921d6d9bf7861fe9f996562f17beecf6a2 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 5 Sep 2012 22:17:33 +0200 Subject: Add missing ; to js code --- apps/files/js/fileactions.js | 8 ++++---- apps/files/js/files.js | 2 +- apps/files_encryption/js/settings.js | 4 ++-- apps/files_external/js/dropbox.js | 4 ++-- apps/files_external/js/settings.js | 4 ++-- apps/files_versions/js/versions.js | 4 ++-- core/js/config.js | 2 +- core/js/js.js | 2 +- core/js/listview.js | 10 +++++----- core/js/setup.js | 4 ++-- core/js/share.js | 2 +- settings/js/admin.js | 4 ++-- settings/js/apps.js | 4 ++-- settings/js/personal.js | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'core/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index f4e7b7723f6..b7670fa2259 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -143,7 +143,7 @@ var FileActions={ getCurrentPermissions:function() { return FileActions.currentFile.parent().data('permissions'); } -} +}; $(document).ready(function(){ if($('#allowZipDownload').val() == 1){ @@ -151,12 +151,12 @@ $(document).ready(function(){ } else { var downloadScope = 'file'; } - FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){ + FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){ window.location=OC.filePath('files', 'ajax', 'download.php') + encodeURIComponent('?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val())); }); }); -FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){ +FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete');},function(filename){ if(Files.cancelUpload(filename)) { if(filename.substr){ filename=[filename]; @@ -174,7 +174,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC. $('.tipsy').remove(); }); -FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ +FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){ FileList.rename(filename); }); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 3d347c3f564..8229bfa24f1 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -26,7 +26,7 @@ Files={ }); procesSelection(); } -} +}; $(document).ready(function() { $('#fileList tr').each(function(){ //little hack to set unescape filenames in attribute diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js index a160b9e0e18..6fc70eba7f6 100644 --- a/apps/files_encryption/js/settings.js +++ b/apps/files_encryption/js/settings.js @@ -20,5 +20,5 @@ $(document).ready(function(){ $('#enable_encryption').change(function(){ var checked=$('#enable_encryption').is(':checked'); OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false'); - }) -}) \ No newline at end of file + }); +}); diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index 92194792f42..dd3a1cb1858 100644 --- a/apps/files_external/js/dropbox.js +++ b/apps/files_external/js/dropbox.js @@ -10,7 +10,7 @@ $(document).ready(function() { var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val(); var config = $(this).find('.configuration'); if (app_key != '' && app_secret != '') { - var pos = window.location.search.indexOf('oauth_token') + 12 + var pos = window.location.search.indexOf('oauth_token') + 12; var token = $(this).find('.configuration [data-parameter="token"]'); if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) { var token_secret = $(this).find('.configuration [data-parameter="token_secret"]'); @@ -73,7 +73,7 @@ $(document).ready(function() { } }); } else { - OC.dialogs.alert('Please provide a valid Dropbox app key and secret.', 'Error configuring Dropbox storage') + OC.dialogs.alert('Please provide a valid Dropbox app key and secret.', 'Error configuring Dropbox storage'); } }); diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index f3460070901..89f346574e2 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -66,7 +66,7 @@ OC.MountConfig={ return true; } } -} +}; $(document).ready(function() { $('.chzn-select').chosen(); @@ -179,4 +179,4 @@ $(document).ready(function() { } }); -}); \ No newline at end of file +}); diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index a9cf6171e45..1c8d083ea42 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -11,7 +11,7 @@ $(document).ready(function() { $(document).ready(function(){ if (typeof FileActions !== 'undefined') { // Add history button to files/index.php - FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){ + FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history');},function(filename){ if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback @@ -76,7 +76,7 @@ function createVersionsDropdown(filename, files) { $('#found_versions').change(function(){ var revision=parseInt($(this).val()); revertFile(files,revision); - }) + }); } }); diff --git a/core/js/config.js b/core/js/config.js index 11168f1c483..f7a29276f7d 100644 --- a/core/js/config.js +++ b/core/js/config.js @@ -51,5 +51,5 @@ OC.AppConfig={ deleteApp:function(app){ OC.AppConfig.postCall('deleteApp',{app:app}); }, -} +}; //TODO OC.Preferences diff --git a/core/js/js.js b/core/js/js.js index 8b9ecd38dc2..1bd650bb6b8 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -208,7 +208,7 @@ OC={ popup.prepend('

    '+t('core', 'Settings')+'

    ').show(); popup.find('.close').bind('click', function() { popup.remove(); - }) + }); if(typeof props.loadJS !== 'undefined') { var scriptname; if(props.loadJS === true) { diff --git a/core/js/listview.js b/core/js/listview.js index e3e5ebdab8f..3a713a6222c 100644 --- a/core/js/listview.js +++ b/core/js/listview.js @@ -11,15 +11,15 @@ ListView.generateTable=function(collumns){ html+=''; html+=''; html+=''; - html+'' + html+''; $.each(collumns,function(index,collumn){ html+=''; }); - html+'' + html+''; html+=''; html=''; return $(html); -} +}; ListView.prototype={ rows:{}, @@ -49,7 +49,7 @@ ListView.prototype={ var element=$(html); element.append($('')); element.click(element.callback); - tr.children('td.'+collumn).append(element) + tr.children('td.'+collumn).append(element); }); }); if(this.deleteCallback){ @@ -68,4 +68,4 @@ ListView.prototype={ empty:function(){ this.element.children('tr:not(.template)').remove(); } -} \ No newline at end of file +}; diff --git a/core/js/setup.js b/core/js/setup.js index 23c705a0686..39fcf4a2715 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -1,11 +1,11 @@ -var dbtypes +var dbtypes; $(document).ready(function() { dbtypes={ sqlite:!!$('#hasSQLite').val(), mysql:!!$('#hasMySQL').val(), postgresql:!!$('#hasPostgreSQL').val(), oracle:!!$('#hasOracle').val(), - } + }; $('#selectDbType').buttonset(); $('#datadirContent').hide(250); diff --git a/core/js/share.js b/core/js/share.js index e97302b0d5a..b5e8b0e6613 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -137,7 +137,7 @@ OC.Share={ html += ''; html += '
    '; html += ''; - html += '
    ' + html += ''; html += ''; } html += ''; diff --git a/settings/js/admin.js b/settings/js/admin.js index 23f445b708f..95b7a503c27 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -26,8 +26,8 @@ $(document).ready(function(){ var value = 'no'; } } else { - var value = $(this).val() + var value = $(this).val(); } OC.AppConfig.setValue('core', $(this).attr('name'), value); }); -}); \ No newline at end of file +}); diff --git a/settings/js/apps.js b/settings/js/apps.js index f9612482373..bb931232763 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -96,7 +96,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } return app; } -} +}; $(document).ready(function(){ $('#leftcontent li').each(function(index,li){ @@ -106,7 +106,7 @@ $(document).ready(function(){ }); $('#leftcontent li').keydown(function(event) { if (event.which == 13 || event.which == 32) { - $(event.target).click() + $(event.target).click(); } return false; }); diff --git a/settings/js/personal.js b/settings/js/personal.js index 77d103c53b6..a866e321ad6 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -83,4 +83,4 @@ OC.msg={ $(selector).html( data.data.message ).addClass('error'); } } -} +}; -- cgit v1.2.3 From a8de0af2732020e9f9d60dcf6a4571fe62e242de Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 5 Sep 2012 22:22:04 +0200 Subject: Add 'var' before some global js vars --- core/js/oc-dialogs.js | 2 +- core/js/oc-vcategories.js | 2 +- settings/js/users.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/js') diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 0fa41696a16..4dd3c89c14d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -22,7 +22,7 @@ /** * this class to ease the usage of jquery dialogs */ -OCdialogs = { +var OCdialogs = { /** * displays alert dialog * @param text content of dialog diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js index dfed8223b1b..c7b536a2a7d 100644 --- a/core/js/oc-vcategories.js +++ b/core/js/oc-vcategories.js @@ -1,4 +1,4 @@ -OCCategories={ +var OCCategories={ edit:function(){ if(OCCategories.app == undefined) { OC.dialogs.alert('OCCategories.app is not set!'); diff --git a/settings/js/users.js b/settings/js/users.js index d0a3c1c21ab..20bd94993bc 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -4,7 +4,7 @@ * See the COPYING-README file. */ -UserList={ +var UserList={ useUndo:true, /** -- cgit v1.2.3 From e0db35fac0e1938a0337790162657b64143d87fd Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 5 Sep 2012 22:23:32 +0200 Subject: Fix name for OCCategories --- core/js/oc-vcategories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js index c7b536a2a7d..c99dd51f53a 100644 --- a/core/js/oc-vcategories.js +++ b/core/js/oc-vcategories.js @@ -95,7 +95,7 @@ var OCCategories={ } }).error(function(xhr){ if (xhr.status == 404) { - OC.dialogs.alert('The required file ' + OC.filePath(Categories.app, 'ajax', 'categories/rescan.php') + ' is not installed!', 'Error'); + OC.dialogs.alert('The required file ' + OC.filePath(OCCategories.app, 'ajax', 'categories/rescan.php') + ' is not installed!', 'Error'); } }); }, -- cgit v1.2.3