diff --git a/ui/bookmarks.js b/ui/bookmarks.js index 7d90fbf7..fea29273 100755 --- a/ui/bookmarks.js +++ b/ui/bookmarks.js @@ -54,12 +54,10 @@ var updateBookmarkedImageMark = makeMarkUpdater( // XXX not sure that these should be modes... var toggleBookmarkedOnlyView = makeCropModeToggler( - 'bookmarked-only-view', cropBookmarkedImages) var toggleBookmarkedOnlyWithRibbonsView = makeCropModeToggler( - 'bookmarked-only-view', function(){ cropBookmarkedImages(null, true) }) diff --git a/ui/crop.js b/ui/crop.js index 71d2286d..9d652da7 100755 --- a/ui/crop.js +++ b/ui/crop.js @@ -164,12 +164,11 @@ function showAllData(){ // Make a generic crop mode toggler // -// NOTE: crop modes are exclusive -- it is not possible to enter one crop -// mode from a different crop mode +// NOTE: cls is optional... function makeCropModeToggler(crop){ var res = createCSSClassToggler( '.viewer', - '.cropped-view', + 'cropped-view', function(action){ if(action == 'on'){ showStatusQ('Cropping ribbons...') diff --git a/ui/layout.css b/ui/layout.css index 9d3894cc..4ae608b1 100755 --- a/ui/layout.css +++ b/ui/layout.css @@ -1081,15 +1081,6 @@ button:hover { .marks-visible.viewer .global-mode-indicators .marks-visible { display: inline-block; } -.marked-only-view.viewer .global-mode-indicators .marks-visible { - display: none; -} -.marked-only-view.viewer .global-mode-indicators .marked-only-visible { - display: inline-block; -} -.marked-only-view.viewer:not(.marks-visible) .global-mode-indicators .marked-only-visible:after { - background-color: transparent; -} /* image mark in single image mode... */ .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-bookmarked, .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-marked { @@ -1113,7 +1104,7 @@ button:hover { .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-marked:not(.shown):hover { opacity: 0.8; } -.cropped-view.viewer .global-mode-indicators .cropped-view { +.cropped-view.marks-visible.viewer .global-mode-indicators .cropped-view { color: gray; display: inline-block; } diff --git a/ui/layout.less b/ui/layout.less index 41fc3d83..6bbdeeb6 100755 --- a/ui/layout.less +++ b/ui/layout.less @@ -1114,15 +1114,6 @@ button:hover { .marks-visible.viewer .global-mode-indicators .marks-visible { display: inline-block; } -.marked-only-view.viewer .global-mode-indicators .marks-visible { - display: none; -} -.marked-only-view.viewer .global-mode-indicators .marked-only-visible { - display: inline-block; -} -.marked-only-view.viewer:not(.marks-visible) .global-mode-indicators .marked-only-visible:after { - background-color: transparent; -} /* image mark in single image mode... */ .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-bookmarked, .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-marked { @@ -1150,7 +1141,7 @@ button:hover { -.cropped-view.viewer .global-mode-indicators .cropped-view { +.cropped-view.marks-visible.viewer .global-mode-indicators .cropped-view { color: gray; display: inline-block; } diff --git a/ui/marks.js b/ui/marks.js index c66e895f..05c3db4f 100755 --- a/ui/marks.js +++ b/ui/marks.js @@ -383,12 +383,10 @@ function cropMarkedImages(keep_ribbons, keep_unloaded_gids){ // XXX is this a mode??? var toggleMarkedOnlyView = makeCropModeToggler( - 'marked-only-view', cropMarkedImages) var toggleMarkedOnlyWithRibbonsView = makeCropModeToggler( - 'marked-only-view', function(){ cropMarkedImages(true) })