From 18899bf76ae5f46978a544d3bb39856b0f6a96f3 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 17 Aug 2012 03:49:43 -0400 Subject: [PATCH] refactored --- lib/client/editor.js | 4 ++-- lib/client/viewer.js | 46 +++++++++++++++++--------------------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/lib/client/editor.js b/lib/client/editor.js index accc6282..50edd8bf 100644 --- a/lib/client/editor.js +++ b/lib/client/editor.js @@ -13,7 +13,7 @@ CloudCommander.Editor.CodeMirror = new CloudCommander.Util(); CloudCommander.Editor.CodeMirror.loading = false; /* function loads CodeMirror js and css files */ -CloudCommander.Editor.CodeMirror.load = (function(pParent){ +CloudCommander.Editor.CodeMirror.load = (function(pParent){ /* function shows editor */ var createEditorDiv = function(){ if (!pParent.getById('CloudEditor')) { @@ -209,6 +209,6 @@ CloudCommander.Editor.Keys = (function(){ lFunc(); key_event(); - } + }; } }); \ No newline at end of file diff --git a/lib/client/viewer.js b/lib/client/viewer.js index 3d75a65c..2caad8bd 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -81,21 +81,13 @@ CloudCommander.Viewer.FancyBox.set = (function(){ for (var i=2; i < lA.length; i++) { lName = lA[i].title || lA[i].textContent; - CloudFunc.checkExtension(lName, - ['png','jpg', 'gif','ico']) && - (lA[i].className = 'fancybox') && - (lA[i].rel = 'gallery'); + if(CloudFunc.checkExtension(lName, ['png','jpg', 'gif','ico'])){ + lA[i].className = 'fancybox'; + lA[i].rel = 'gallery'; + }else + lA[i].className = 'fancybox fancybox.ajax'; } - /* $('.fancybox').fancybox(this.getConfig()); */ - /* - $('.fancybox').dblclick( function(){ - var lConfig = lThis.getConfig(); - lConfig.href = this.href; - $.fancybox(lConfig) - }); - $(Images[i]).data("events").dblclick[0].handler - */ var lImages = $('.fancybox'); var lThis = this; @@ -105,10 +97,10 @@ CloudCommander.Viewer.FancyBox.set = (function(){ lConfig.href = pHref; $.fancybox(lConfig); - } - } + }; + }; - for(var i=0; i < lImages.length; i++) + for(i = 0; i < lImages.length; i++) lImages[i].ondblclick = lDblClick_f(lImages[i].href); }catch(pError){ console.log(pError); @@ -133,22 +125,20 @@ CloudCommander.Viewer.Keys = (function(){ "use strict"; var lCallBack_f = (function(){ - var key_event = (function(){ - return function(event){ - /* если клавиши можно обрабатывать */ - if(CloudCommander.keyBinded) - /* if f3 pressed */ - if(event.keyCode === CloudCommander.KEY.F3){ - CloudCommander.Viewer.FancyBox.show(); - - event.preventDefault(); - } - }; + var key_event = (function(pEvent){ + /* если клавиши можно обрабатывать */ + if(CloudCommander.keyBinded) + /* if f3 pressed */ + if(pEvent.keyCode === CloudCommander.KEY.F3){ + CloudCommander.Viewer.FancyBox.show(); + + pEvent.preventDefault(); + } }); /* добавляем обработчик клавишь */ if (document.addEventListener) - document.addEventListener('keydown', key_event(),false); + document.addEventListener('keydown', key_event, false); else{ var lFunc;