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

more simplification and minor fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-02-02 06:00:06 +04:00
parent 655d3ec27c
commit 3704431cbe
5 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/bookmarks.js
View File

@ -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)
})

5
ui/crop.js
View File

@ -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...')

11
ui/layout.css
View File

@ -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;
}

11
ui/layout.less
View File

@ -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;
}

2
ui/marks.js
View File

@ -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)
})