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 tweaking...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-10-19 03:43:22 +04:00
parent 3a929ab7eb
commit 63dfd6dbac
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ui (gen4)/ribbons.js
View File

@ -243,13 +243,23 @@ module.RibbonsPrototype = {
// Set ribbon set scale... // Set ribbon set scale...
// //
// .setScale(<scale>)
// .setScale(<scale>, <image>)
// .setScale(<scale>, 'top'|'center'|'bottom'|<px>|%, 'left'|'center'|'right'|<px>|%)
// -> <ribbons>
//
// NOTE: this will also set origin... // NOTE: this will also set origin...
setScale: function(scale, t, l){ setScale: function(scale, t, l){
var ribbon_set = this.viewer.find('.ribbon-set') var ribbon_set = this.viewer.find('.ribbon-set')
if(t != null && l != null){
this.setOrigin(t, l)
} else {
var img = t == null ? this.getImage() : t var img = t == null ? this.getImage() : t
this.setOrigin(img) this.setOrigin(img)
}
setElementScale(ribbon_set, scale) setElementScale(ribbon_set, scale)
return this return this
@ -268,29 +278,39 @@ module.RibbonsPrototype = {
// -> ribbons // -> ribbons
// //
// Set origin to center of elment: // Set origin to center of elment:
// .setOrigin(elem) // .setOrigin(image)
// -> ribbons // -> ribbons
// //
// Set origin to screen coordinates: // Set origin to screen coordinates:
// .setOrigin(x, y) // .setOrigin(x|%|'left'|'center'|'right', x|%|'top'|'center'|'bottom')
// -> ribbons // -> ribbons
// //
// NOTE: this will also compensate for scaling. // NOTE: this will also compensate for scaling.
// //
// XXX DEBUG: remove point updating when not needed... // XXX DEBUG: remove point updating when not needed...
setOrigin: function(a, b){ setOrigin: function(a, b){
//this.preventTransitions()
var ribbon_set = this.viewer.find('.ribbon-set') var ribbon_set = this.viewer.find('.ribbon-set')
var ro = ribbon_set.offset() var ro = ribbon_set.offset()
var s = this.getScale()
if(typeof(a) == typeof(123) && typeof(b) == typeof(123)){ if(a != null && b != null){
var l = a - ro.top a = a == 'left' ? 0
var t = b - ro.left : a == 'right' ? this.viewer.width()
: a == 'center' ? this.viewer.width()/2
: /[0-9.]*%/.test(a) ? this.viewer.width()*(parseFloat(a)/100)
: a
b = b == 'top' ? 0
: b == 'bottom' ? this.viewer.height()
: b == 'center' ? this.viewer.height()/2
: /[0-9.]*%/.test(b) ? this.viewer.height()*(parseFloat(b)/100)
: b
var l = (a - ro.left)/s
var t = (b - ro.top)/s
} else { } else {
var img = this.getImage(a) var img = this.getImage(a)
var s = this.getScale()
var io = img.offset() var io = img.offset()
var w = img.width() var w = img.width()
var h = img.height() var h = img.height()
@ -306,8 +326,6 @@ module.RibbonsPrototype = {
setElementOffset($('.point'), l, t) setElementOffset($('.point'), l, t)
} }
//this.restoreTransitions(true)
return this return this
}, },