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

some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-01-01 02:22:17 +03:00
parent e553bcc378
commit 5f2d7d2188
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui (gen4)/features/cli.js
View File

@ -43,8 +43,7 @@ module.CLI = core.ImageGridFeatures.Feature({
depends: ['base'], depends: ['base'],
isApplicable: function(){ isApplicable: function(){
return this.runtime == 'node' || this.runtime == 'nw' return this.runtime == 'node' || this.runtime == 'nw' },
},
handlers: [ handlers: [
['start', ['start',
@ -106,9 +105,6 @@ module.CLI = core.ImageGridFeatures.Feature({
/********************************************************************** /**********************************************************************
* vim:set ts=4 sw=4 : */ * vim:set ts=4 sw=4 : */
return module }) return module })

10
ui (gen4)/features/ui.js
View File

@ -2816,7 +2816,10 @@ module.IndirectControl = core.ImageGridFeatures.Feature({
function(_, state){ function(_, state){
if(state == null){ if(state == null){
return this.__touch_handler || 'none' return (this.ribbons
&& this.ribbons.viewer
&& this.ribbons.viewer.data('hammer'))
|| 'none'
// on... // on...
} else if(state == 'handling-swipes'){ } else if(state == 'handling-swipes'){
@ -2824,13 +2827,13 @@ module.IndirectControl = core.ImageGridFeatures.Feature({
var viewer = this.ribbons.viewer var viewer = this.ribbons.viewer
// prevent multiple handlers... // prevent multiple handlers...
if(this.__touch_handler){ if(viewer.data('hammer') != null){
return return
} }
viewer.hammer() viewer.hammer()
var h = this.__touch_handler = viewer.data('hammer') var h = viewer.data('hammer')
h.get('swipe').set({direction: Hammer.DIRECTION_ALL}) h.get('swipe').set({direction: Hammer.DIRECTION_ALL})
viewer viewer
@ -2847,7 +2850,6 @@ module.IndirectControl = core.ImageGridFeatures.Feature({
.off('swipeup') .off('swipeup')
.off('swipedown') .off('swipedown')
.removeData('hammer') .removeData('hammer')
delete this.__touch_handler
} }
}, },

4
ui (gen4)/ig.js
View File

@ -1,6 +1,7 @@
#!/usr/bin/env node #!/usr/bin/env node
/********************************************************************** /**********************************************************************
* *
* ImageGrid.CLI entry point...
* *
* *
**********************************************************************/ **********************************************************************/
@ -21,6 +22,7 @@ require = requirejs
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// XXX need to automate this...
var core = require('features/core') var core = require('features/core')
var base = require('features/base') var base = require('features/base')
var location = require('features/location') var location = require('features/location')
@ -43,7 +45,6 @@ module.ImageGridFeatures =
core.ImageGridFeatures core.ImageGridFeatures
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// setup actions and start... // setup actions and start...
@ -53,6 +54,5 @@ ImageGridFeatures
/********************************************************************** /**********************************************************************
* vim:set ts=4 sw=4 : */ * vim:set ts=4 sw=4 : */