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

fixed load animations + added mixin methods (needs testing and more thought)...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-10-28 03:37:37 +03:00
parent ac03e40193
commit a4449b88d0
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui (gen4)/lib/actions.js
View File

@ -357,8 +357,7 @@ module.MetaActions = {
//
// NOTE: 'post' mode is the default.
//
// XXX add something like text tags to events (extra arg) to enable
// simple and fast handler removal...
// XXX document tags...
on: function(actions, b, c){
var handler = typeof(c) == 'function' ? c : b
var tag = typeof(c) == 'function' ? b : c
@ -407,7 +406,7 @@ module.MetaActions = {
// Remove an action callback...
//
// XXX needs more testing...
// XXX document tags...
off: function(actions, handler){
if(this.hasOwnProperty('_action_handlers')){
@ -461,11 +460,29 @@ module.MetaActions = {
// NOTE: if 'all' is set them mixin all the actions available,
// otherwise only mixin local actions...
mixin: function(from, all){
// XXX link actions from 'from' into this...
// XXX test
mixin: function(from, all, all_attr_types){
if(all){
var keys = []
for(var k in from){
keys.push(k)
}
} else {
var keys = Object.keys(from)
}
var that = this
keys.forEach(function(k){
var attr = from[k]
if(all_attr_types || attr instanceof Action){
that[k] = attr
}
})
return this
},
mixinto: function(to, all){
return this.mixin.call(to, this, all)
mixinto: function(to, all, all_attr_types){
return this.mixin.call(to, this, all, all_attr_types)
},
}

11
ui (gen4)/viewer.js
View File

@ -463,7 +463,14 @@ actions.Actions(Client, {
: viewer
// XXX do we need to recycle the images???
this.ribbons = ribbons.Ribbons(viewer, data.images)
// XXX is keeping ribbons here correct???
if(this.ribbons == null){
this.ribbons = ribbons.Ribbons(viewer, data.images)
}
// NOTE: this is here to prevent animations when the view
// is resized and recentered...
this.ribbons.preventTransitions()
return function(){
// XXX do a partial load...
@ -471,6 +478,8 @@ actions.Actions(Client, {
this.ribbons.updateData(this.data)
this.focusImage()
this.ribbons.restoreTransitions()
}
}],
reload: [