flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-11-02 04:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

some general cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-09-21 03:29:05 +04:00
parent 5ff3b12417
commit ed90c39bb3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/marks.js
View File

@ -50,18 +50,18 @@ var toggleMarkedOnlyView = createCSSClassToggler(
'.viewer', '.viewer',
'marked-only-view cropped-mode', 'marked-only-view cropped-mode',
function(action){ function(action){
//// prevent reentering... // prevent mixing marked-only and single-ribbon modes...
//if(action == 'on' && $('.viewer').hasClass('cropped-mode') // XXX is there a more generic way to do this???
// || action == toggleMarkedOnlyView('?')){ // ..without including direct mode dependencies?
if(action == 'on' && toggleSingleImageMode('?') == 'on'){ if(action == 'on' && toggleSingleImageMode('?') == 'on'){
return false return false
} }
}, },
function(action){ function(action){
if(action == 'on'){ if(action == 'on'){
// XXX do we need to keep ribbons here???
cropMarkedImages() cropMarkedImages()
} else { } else {
//uncropData()
showAllData() showAllData()
} }
}) })

6
ui/modes.js
View File

@ -177,10 +177,9 @@ var toggleSingleRibbonMode = createCSSClassToggler(
'.viewer', '.viewer',
'single-ribbon-mode cropped-mode', 'single-ribbon-mode cropped-mode',
function(action){ function(action){
//// prevent reentering...
//if(action == 'on' && $('.viewer').hasClass('cropped-mode')
// || action == toggleSingleRibbonMode('?')){
// prevent mixing marked-only and single-ribbon modes... // prevent mixing marked-only and single-ribbon modes...
// XXX is there a more generic way to do this???
// ..without including direct mode dependencies?
if(action == 'on' && toggleMarkedOnlyView('?') == 'on'){ if(action == 'on' && toggleMarkedOnlyView('?') == 'on'){
return false return false
} }
@ -189,7 +188,6 @@ var toggleSingleRibbonMode = createCSSClassToggler(
if(action == 'on'){ if(action == 'on'){
cropDataTo(DATA.ribbons[getRibbonIndex()].slice()) cropDataTo(DATA.ribbons[getRibbonIndex()].slice())
} else { } else {
//uncropData()
showAllData() showAllData()
} }
}) })