mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-25 22:56:11 +03:00
removed this._button from Button and renamed it to this.element since thats what this.get_element returned. may eventually move to a more jquery like pattern of extending the element with the methods of Button.
This commit is contained in:
parent
661eb225f9
commit
1395157adf
@ -3,7 +3,7 @@
|
|||||||
* (c) 2010 OpenSeadragon
|
* (c) 2010 OpenSeadragon
|
||||||
* (c) 2010 CodePlex Foundation
|
* (c) 2010 CodePlex Foundation
|
||||||
*
|
*
|
||||||
* OpenSeadragon 0.8.11
|
* OpenSeadragon 0.8.12
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
*
|
*
|
||||||
* License: New BSD License (BSD)
|
* License: New BSD License (BSD)
|
||||||
@ -243,6 +243,13 @@ OpenSeadragon = window.OpenSeadragon || (function(){
|
|||||||
|
|
||||||
}( OpenSeadragon ));
|
}( OpenSeadragon ));
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* TODO: all of utils should be moved to the object literal namespace
|
||||||
|
* OpenSeadragon for less indirection. If it's useful, it's useful
|
||||||
|
* without the name 'utils'.
|
||||||
|
*
|
||||||
|
**/
|
||||||
|
|
||||||
OpenSeadragon.Utils = OpenSeadragon.Utils || function(){};
|
OpenSeadragon.Utils = OpenSeadragon.Utils || function(){};
|
||||||
|
|
||||||
@ -2769,7 +2776,10 @@ $.Button = function( options ) {
|
|||||||
this._srcGroup = options.srcGroup;
|
this._srcGroup = options.srcGroup;
|
||||||
this._srcHover = options.srcHover;
|
this._srcHover = options.srcHover;
|
||||||
this._srcDown = options.srcDown;
|
this._srcDown = options.srcDown;
|
||||||
this._button = options.button;
|
//TODO: make button elements accessible by making them a-tags
|
||||||
|
// maybe even consider basing them on the element and adding
|
||||||
|
// methods jquery-style.
|
||||||
|
this.element = options.element || $.Utils.makeNeutralElement("span");
|
||||||
this.config = options.config;
|
this.config = options.config;
|
||||||
|
|
||||||
if ( options.onPress != undefined ){
|
if ( options.onPress != undefined ){
|
||||||
@ -2788,10 +2798,9 @@ $.Button = function( options ) {
|
|||||||
this.addHandler("onExit", options.onExit );
|
this.addHandler("onExit", options.onExit );
|
||||||
}
|
}
|
||||||
|
|
||||||
this._button = $.Utils.makeNeutralElement("span");
|
|
||||||
this._currentState = $.ButtonState.GROUP;
|
this._currentState = $.ButtonState.GROUP;
|
||||||
this._tracker = new $.MouseTracker(
|
this._tracker = new $.MouseTracker(
|
||||||
this._button,
|
this.element,
|
||||||
this.config.clickTimeThreshold,
|
this.config.clickTimeThreshold,
|
||||||
this.config.clickDistThreshold
|
this.config.clickDistThreshold
|
||||||
);
|
);
|
||||||
@ -2805,14 +2814,14 @@ $.Button = function( options ) {
|
|||||||
this._fadeBeginTime = null;
|
this._fadeBeginTime = null;
|
||||||
this._shouldFade = false;
|
this._shouldFade = false;
|
||||||
|
|
||||||
this._button.style.display = "inline-block";
|
this.element.style.display = "inline-block";
|
||||||
this._button.style.position = "relative";
|
this.element.style.position = "relative";
|
||||||
this._button.title = this._tooltip;
|
this.element.title = this._tooltip;
|
||||||
|
|
||||||
this._button.appendChild(this._imgRest);
|
this.element.appendChild(this._imgRest);
|
||||||
this._button.appendChild(this._imgGroup);
|
this.element.appendChild(this._imgGroup);
|
||||||
this._button.appendChild(this._imgHover);
|
this.element.appendChild(this._imgHover);
|
||||||
this._button.appendChild(this._imgDown);
|
this.element.appendChild(this._imgDown);
|
||||||
|
|
||||||
var styleRest = this._imgRest.style;
|
var styleRest = this._imgRest.style;
|
||||||
var styleGroup = this._imgGroup.style;
|
var styleGroup = this._imgGroup.style;
|
||||||
@ -2944,7 +2953,7 @@ $.extend( $.Button.prototype, $.EventHandler.prototype, {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
get_element: function() {
|
get_element: function() {
|
||||||
return this._button;
|
return this.element;
|
||||||
},
|
},
|
||||||
get_tooltip: function() {
|
get_tooltip: function() {
|
||||||
return this._tooltip;
|
return this._tooltip;
|
||||||
@ -3025,7 +3034,7 @@ $.ButtonGroup = function( options ) {
|
|||||||
|
|
||||||
this.element.style.display = "inline-block";
|
this.element.style.display = "inline-block";
|
||||||
for ( i = 0; i < buttons.length; i++ ) {
|
for ( i = 0; i < buttons.length; i++ ) {
|
||||||
this.element.appendChild( buttons[ i ].get_element() );
|
this.element.appendChild( buttons[ i ].element );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -4032,10 +4041,14 @@ $.Viewport.prototype = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getCenter: function(current) {
|
getCenter: function(current) {
|
||||||
var centerCurrent = new $.Point(this._centerSpringX.getCurrent(),
|
var centerCurrent = new $.Point(
|
||||||
this._centerSpringY.getCurrent());
|
this._centerSpringX.getCurrent(),
|
||||||
var centerTarget = new $.Point(this._centerSpringX.getTarget(),
|
this._centerSpringY.getCurrent()
|
||||||
this._centerSpringY.getTarget());
|
);
|
||||||
|
var centerTarget = new $.Point(
|
||||||
|
this._centerSpringX.getTarget(),
|
||||||
|
this._centerSpringY.getTarget()
|
||||||
|
);
|
||||||
|
|
||||||
if (current) {
|
if (current) {
|
||||||
return centerCurrent;
|
return centerCurrent;
|
||||||
|
@ -17,7 +17,10 @@ $.Button = function( options ) {
|
|||||||
this._srcGroup = options.srcGroup;
|
this._srcGroup = options.srcGroup;
|
||||||
this._srcHover = options.srcHover;
|
this._srcHover = options.srcHover;
|
||||||
this._srcDown = options.srcDown;
|
this._srcDown = options.srcDown;
|
||||||
this._button = options.button;
|
//TODO: make button elements accessible by making them a-tags
|
||||||
|
// maybe even consider basing them on the element and adding
|
||||||
|
// methods jquery-style.
|
||||||
|
this.element = options.element || $.Utils.makeNeutralElement("span");
|
||||||
this.config = options.config;
|
this.config = options.config;
|
||||||
|
|
||||||
if ( options.onPress != undefined ){
|
if ( options.onPress != undefined ){
|
||||||
@ -36,10 +39,9 @@ $.Button = function( options ) {
|
|||||||
this.addHandler("onExit", options.onExit );
|
this.addHandler("onExit", options.onExit );
|
||||||
}
|
}
|
||||||
|
|
||||||
this._button = $.Utils.makeNeutralElement("span");
|
|
||||||
this._currentState = $.ButtonState.GROUP;
|
this._currentState = $.ButtonState.GROUP;
|
||||||
this._tracker = new $.MouseTracker(
|
this._tracker = new $.MouseTracker(
|
||||||
this._button,
|
this.element,
|
||||||
this.config.clickTimeThreshold,
|
this.config.clickTimeThreshold,
|
||||||
this.config.clickDistThreshold
|
this.config.clickDistThreshold
|
||||||
);
|
);
|
||||||
@ -53,14 +55,14 @@ $.Button = function( options ) {
|
|||||||
this._fadeBeginTime = null;
|
this._fadeBeginTime = null;
|
||||||
this._shouldFade = false;
|
this._shouldFade = false;
|
||||||
|
|
||||||
this._button.style.display = "inline-block";
|
this.element.style.display = "inline-block";
|
||||||
this._button.style.position = "relative";
|
this.element.style.position = "relative";
|
||||||
this._button.title = this._tooltip;
|
this.element.title = this._tooltip;
|
||||||
|
|
||||||
this._button.appendChild(this._imgRest);
|
this.element.appendChild(this._imgRest);
|
||||||
this._button.appendChild(this._imgGroup);
|
this.element.appendChild(this._imgGroup);
|
||||||
this._button.appendChild(this._imgHover);
|
this.element.appendChild(this._imgHover);
|
||||||
this._button.appendChild(this._imgDown);
|
this.element.appendChild(this._imgDown);
|
||||||
|
|
||||||
var styleRest = this._imgRest.style;
|
var styleRest = this._imgRest.style;
|
||||||
var styleGroup = this._imgGroup.style;
|
var styleGroup = this._imgGroup.style;
|
||||||
@ -192,7 +194,7 @@ $.extend( $.Button.prototype, $.EventHandler.prototype, {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
get_element: function() {
|
get_element: function() {
|
||||||
return this._button;
|
return this.element;
|
||||||
},
|
},
|
||||||
get_tooltip: function() {
|
get_tooltip: function() {
|
||||||
return this._tooltip;
|
return this._tooltip;
|
||||||
|
@ -32,7 +32,7 @@ $.ButtonGroup = function( options ) {
|
|||||||
|
|
||||||
this.element.style.display = "inline-block";
|
this.element.style.display = "inline-block";
|
||||||
for ( i = 0; i < buttons.length; i++ ) {
|
for ( i = 0; i < buttons.length; i++ ) {
|
||||||
this.element.appendChild( buttons[ i ].get_element() );
|
this.element.appendChild( buttons[ i ].element );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,11 @@
|
|||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* TODO: all of utils should be moved to the object literal namespace
|
||||||
|
* OpenSeadragon for less indirection. If it's useful, it's useful
|
||||||
|
* without the name 'utils'.
|
||||||
|
*
|
||||||
|
**/
|
||||||
|
|
||||||
OpenSeadragon.Utils = OpenSeadragon.Utils || function(){};
|
OpenSeadragon.Utils = OpenSeadragon.Utils || function(){};
|
||||||
|
|
||||||
|
@ -50,10 +50,14 @@ $.Viewport.prototype = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getCenter: function(current) {
|
getCenter: function(current) {
|
||||||
var centerCurrent = new $.Point(this._centerSpringX.getCurrent(),
|
var centerCurrent = new $.Point(
|
||||||
this._centerSpringY.getCurrent());
|
this._centerSpringX.getCurrent(),
|
||||||
var centerTarget = new $.Point(this._centerSpringX.getTarget(),
|
this._centerSpringY.getCurrent()
|
||||||
this._centerSpringY.getTarget());
|
);
|
||||||
|
var centerTarget = new $.Point(
|
||||||
|
this._centerSpringX.getTarget(),
|
||||||
|
this._centerSpringY.getTarget()
|
||||||
|
);
|
||||||
|
|
||||||
if (current) {
|
if (current) {
|
||||||
return centerCurrent;
|
return centerCurrent;
|
||||||
|
Loading…
Reference in New Issue
Block a user