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

minor refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-03-29 05:22:36 +03:00
parent e5169c3fcd
commit d32de4b81c
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ui (gen4)/features/ui-slideshow.js
View File

@ -26,11 +26,11 @@ var overlay = require('lib/widget/overlay')
// slideshow progress/status... // slideshow progress/status...
var SlideshowActions = actions.Actions({ var SlideshowActions = actions.Actions({
config: { config: {
'ui-slideshow-looping': 'on', 'slideshow-looping': 'on',
'ui-slideshow-direction': 'forward', 'slideshow-direction': 'forward',
'ui-slideshow-interval': '3s', 'slideshow-interval': '3s',
'ui-slideshow-intervals': [ 'slideshow-intervals': [
'0.2s', '0.2s',
'1s', '1s',
'3s', '3s',
@ -66,11 +66,11 @@ var SlideshowActions = actions.Actions({
null, null,
[ [
['Interval: ', ['Interval: ',
function(){ return that.config['ui-slideshow-interval'] }], function(){ return that.config['slideshow-interval'] }],
['Direction: ', ['Direction: ',
function(){ return that.config['ui-slideshow-direction'] }], function(){ return that.config['slideshow-direction'] }],
['Looping: ', ['Looping: ',
function(){ return that.config['ui-slideshow-looping'] }], function(){ return that.config['slideshow-looping'] }],
'---', '---',
[function(){ [function(){
@ -90,7 +90,7 @@ var SlideshowActions = actions.Actions({
var to_remove = [] var to_remove = []
var oo = overlay.Overlay(that.ribbons.viewer, var oo = overlay.Overlay(that.ribbons.viewer,
browse.makeList( null, browse.makeList( null,
that.config['ui-slideshow-intervals'], that.config['slideshow-intervals'],
{itemButtons: [ {itemButtons: [
// mark for removal... // mark for removal...
['&times;', ['&times;',
@ -111,7 +111,7 @@ var SlideshowActions = actions.Actions({
}], }],
]}) ]})
.open(function(evt, time){ .open(function(evt, time){
that.config['ui-slideshow-interval'] = time that.config['slideshow-interval'] = time
// XXX this is ugly... // XXX this is ugly...
oo.close() oo.close()
@ -121,10 +121,10 @@ var SlideshowActions = actions.Actions({
.close(function(){ .close(function(){
// remove striked items... // remove striked items...
to_remove.forEach(function(e){ to_remove.forEach(function(e){
var lst = that.config['ui-slideshow-intervals'].slice() var lst = that.config['slideshow-intervals'].slice()
lst.splice(lst.indexOf(e), 1) lst.splice(lst.indexOf(e), 1)
that.config['ui-slideshow-intervals'] = lst that.config['slideshow-intervals'] = lst
}) })
// XXX this is ugly... // XXX this is ugly...
@ -135,7 +135,7 @@ var SlideshowActions = actions.Actions({
} }
}) })
oo.client.select(that.config['ui-slideshow-interval']) oo.client.select(that.config['slideshow-interval'])
return return
} }
@ -172,13 +172,13 @@ var SlideshowActions = actions.Actions({
// XXX add a custom time setting... // XXX add a custom time setting...
toggleSlideshowInterval: ['- Slideshow/Interval', toggleSlideshowInterval: ['- Slideshow/Interval',
core.makeConfigToggler('ui-slideshow-interval', core.makeConfigToggler('slideshow-interval',
function(){ return this.config['ui-slideshow-intervals'] }, function(){ return this.config['slideshow-intervals'] },
function(){ this.resetSlideshowTimer() })], function(){ this.resetSlideshowTimer() })],
toggleSlideshowDirection: ['- Slideshow/Direction', toggleSlideshowDirection: ['- Slideshow/Direction',
core.makeConfigToggler('ui-slideshow-direction', ['forward', 'reverse'])], core.makeConfigToggler('slideshow-direction', ['forward', 'reverse'])],
toggleSlideshowLooping: ['- Slideshow/Looping', toggleSlideshowLooping: ['- Slideshow/Looping',
core.makeConfigToggler('ui-slideshow-looping', ['on', 'off'])], core.makeConfigToggler('slideshow-looping', ['on', 'off'])],
toggleSlideshow: ['Slideshow/Quick toggle', toggleSlideshow: ['Slideshow/Quick toggle',
toggler.CSSClassToggler( toggler.CSSClassToggler(
@ -225,15 +225,15 @@ var SlideshowActions = actions.Actions({
var cur = that.current var cur = that.current
// next step... // next step...
that.config['ui-slideshow-direction'] == 'forward' ? that.config['slideshow-direction'] == 'forward' ?
that.nextImage() that.nextImage()
: that.prevImage() : that.prevImage()
// we have reached the end... // we have reached the end...
if(that.current == cur){ if(that.current == cur){
// loop... // loop...
if(that.config['ui-slideshow-looping'] == 'on'){ if(that.config['slideshow-looping'] == 'on'){
that.config['ui-slideshow-direction'] == 'forward' ? that.config['slideshow-direction'] == 'forward' ?
that.firstImage() that.firstImage()
: that.lastImage() : that.lastImage()
@ -242,7 +242,7 @@ var SlideshowActions = actions.Actions({
that.toggleSlideshow('off') that.toggleSlideshow('off')
} }
} }
}, Date.str2ms(this.config['ui-slideshow-interval'] || '3s')) }, Date.str2ms(this.config['slideshow-interval'] || '3s'))
// stop... // stop...
} else { } else {