minor changes

This commit is contained in:
coderaiser 2012-11-14 10:36:13 -05:00
parent 205d58a58e
commit eece76243d
2 changed files with 37 additions and 37 deletions

View file

@ -3,13 +3,12 @@ var CloudCommander, $, Util, DOM, CloudFunc;
(function(){
"use strict";
var cloudcmd = CloudCommander;
DOM = {};
/* PRIVATE */
function getCurrentFile(){
return cloudcmd.CURRENT_FILE;
return CloudCommander.CURRENT_FILE;
}
/* private members */
@ -578,7 +577,7 @@ var CloudCommander, $, Util, DOM, CloudFunc;
* set onclick handler on button f1-f10
*/
DOM.setButtonKey = function(pKey, pFunc){
return cloudcmd.KeysPanel[pKey].onclick = pFunc;
return CloudCommander.KeysPanel[pKey].onclick = pFunc;
};
var lUnSetCurrentFile = function(pCurrentFile){
@ -666,7 +665,7 @@ var CloudCommander, $, Util, DOM, CloudFunc;
* then always work with passive
* panel
*/
if(window.innerWidth < cloudcmd.MIN_ONE_PANEL_WIDTH)
if(window.innerWidth < CloudCommander.MIN_ONE_PANEL_WIDTH)
lPanel = DOM.getById('left');

View file

@ -23,35 +23,39 @@ var CloudCommander, Util, DOM, CloudFunc, $;
function set(){
if(DOM.getByClass('fancybox').length)
return;
Util.tryCatchLog(function(){
/* get current panel (left or right) */
var lPanel = DOM.getPanel(),
/* get all file links */
var lA = DOM.getByTag('a', DOM.getPanel(false) ),
lActiveA = DOM.getByTag('a', DOM.getPanel(true) ),
/* get all file links */
lA = DOM.getByTag('a', lPanel),
lDblClick_f = function(pA){
return function(){
var lConfig = FancyBox.getConfig();
lConfig.href = pA.href;
if(pA.rel)
$.fancybox(lConfig);
else
FancyBox.loadData(pA, FancyBox.onDataLoaded);
};
lDblClick_f = function(pA){
return function(){
var lConfig = FancyBox.getConfig();
lConfig.href = pA.href;
if(pA.rel)
$.fancybox(lConfig);
else
FancyBox.loadData(pA, FancyBox.onDataLoaded);
};
},
lSetOnclick = function(pA){
/* first two is not files nor folders*/
for (var i = 2, n = pA.length; i < n; i++) {
var lA = pA[i],
lName = lA.title || lA.textContent;
lA.className = 'fancybox';
if(CloudFunc.checkExtension(lName, ['png','jpg', 'gif','ico']))
lA.rel = 'gallery';
lA.ondblclick = lDblClick_f(lA);
}
};
/* first two is not files nor folders*/
for (var i = 2, n = lA.length; i < n; i++) {
var lName = lA[i].title || lA[i].textContent;
lA[i].className = 'fancybox';
if(CloudFunc.checkExtension(lName, ['png','jpg', 'gif','ico']))
lA[i].rel = 'gallery';
lA[i].ondblclick = lDblClick_f(lA[i]);
}
});
lSetOnclick(lA);
lSetOnclick(lActiveA);
}
@ -152,11 +156,8 @@ var CloudCommander, Util, DOM, CloudFunc, $;
return DOM.Images.showError(jqXHR, textStatus, errorThrown);
}, this),
success:function(data, textStatus, jqXHR){
if(typeof pSuccess_f === 'function')
pSuccess_f(data);
DOM.Images.hideLoad();
success:function(data, textStatus, jqXHR){
Util.exec(pSuccess_f, data);
}
});
};
@ -169,6 +170,8 @@ var CloudCommander, Util, DOM, CloudFunc, $;
pData = JSON.stringify(pData, null, 4);
$.fancybox('<div id=CloudViewer tabindex=0>' + pData + '</div>', lConfig);
DOM.Images.hideLoad();
};
/**
@ -190,8 +193,6 @@ var CloudCommander, Util, DOM, CloudFunc, $;
else FancyBox.loadData(lA, FancyBox.onDataLoaded);
}
}
DOM.Images.hideLoad();
};
cloudcmd.Viewer.Keys = function(){