diff --git a/ChangeLog b/ChangeLog index e15e6c98..e3b5b10e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,14 @@ keyStop: function(e, opt) { * Updated jquery-terminal to v0.4.22. +* Refactore viewer module. + +* Removed loading spinner by commenting jquery.fancybox.css block +#fancybox-loading div { + width: 44px; + height: 44px; + background: url('fancybox_loading.gif') center center no-repeat; +} 2012.12.12, Version 0.1.8 diff --git a/lib/client/viewer.js b/lib/client/viewer.js index c14fcf30..4d1cac91 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -24,9 +24,7 @@ var CloudCommander, Util, DOM, CloudFunc, $; */ function getConfig(){ return{ - /* function do her work - * before FauncyBox shows - */ + afterLoad : $.fancybox.hideLoading, beforeShow : function(){ DOM.Images.hideLoad(); KeyBinding.unSet(); @@ -65,11 +63,10 @@ var CloudCommander, Util, DOM, CloudFunc, $; var lDir = cloudcmd.LIBDIRCLIENT + 'viewer/fancybox/', lFiles = [ lDir + 'jquery.fancybox.css', lDir + 'jquery.fancybox.js' ]; - - - DOM.anyLoadInParallel(lFiles, function(){ + + DOM.anyLoadOnLoad(lFiles, function(){ console.timeEnd('fancybox load'); - pCallBack(); + Util.exec( pCallBack ); }) .cssSet({id:'viewer', inner : '#CloudViewer{' + diff --git a/lib/client/viewer/fancybox/jquery.fancybox.css b/lib/client/viewer/fancybox/jquery.fancybox.css index d6ff8a17..2731d45b 100644 --- a/lib/client/viewer/fancybox/jquery.fancybox.css +++ b/lib/client/viewer/fancybox/jquery.fancybox.css @@ -90,13 +90,13 @@ cursor: pointer; z-index: 8060; } - +/* #fancybox-loading div { width: 44px; height: 44px; background: url('fancybox_loading.gif') center center no-repeat; } - +*/ .fancybox-close { position: absolute; top: -18px;