fixing a syntax error; picking up latest changes to -core

mootools · Apr 22, 2009 · b653451 · b653451
1 parent 3b9f575
commit b653451
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Source/Element/Element.Position.js b/Source/Element/Element.Position.js
@@ -16,7 +16,7 @@ Element.implement({
 
 	position: function(options){
 		//call setPosition if the options are x/y values
-		if (options && ($defined(options.x) || $defined(options.y))) return this.setPosition.apply(this, arguments) : this;
+		if (options && ($defined(options.x) || $defined(options.y))) return this.setPosition.apply(this, arguments);
 		$each(options||{}, function(v, k){ if (!$defined(v)) delete options[k]; });
 		options = $merge({
 			relativeTo: document.body,

diff --git a/assets/mootools-core/Source/Class/Class.js b/assets/mootools-core/Source/Class/Class.js
@@ -66,7 +66,7 @@ new Native({name: 'Class', initialize: Class}).extend({
 	},
 
 	wrap: function(self, key, method){
-		method = method._origin || method;
+		if (method._origin) method = method._origin;
 
 		return function(){
 			if (method._protected && this._current == null) throw new Error('The method "' + key + '" cannot be called.');

diff --git a/assets/mootools-core/Source/Core/Core.js b/assets/mootools-core/Source/Core/Core.js
@@ -17,7 +17,7 @@ Inspiration:
 */
 
 var MooTools = {
-	'version': '1.2.1',
+	'version': '1.2.2',
 	'build': '%build%'
 };
 

diff --git a/assets/mootools-core/Source/Element/Element.Dimensions.js b/assets/mootools-core/Source/Element/Element.Dimensions.js
@@ -59,12 +59,13 @@ Element.implement({
 		return null;
 	},
 
-	getOffsets: function(){
+	getOffsets: function(){		
 		if (Browser.Engine.trident){
 			var bound = this.getBoundingClientRect(), html = this.getDocument().documentElement;
+			var isFixed = styleString(this, 'position') == 'fixed';
 			return {
-				x: bound.left + html.scrollLeft - html.clientLeft,
-				y: bound.top + html.scrollTop - html.clientTop
+				x: bound.left + ((isFixed) ? 0 : html.scrollLeft) - html.clientLeft,
+				y: bound.top +  ((isFixed) ? 0 : html.scrollTop)  - html.clientTop
 			};
 		}
 
@@ -120,7 +121,7 @@ Element.implement({
 		return {left: obj.x - styleNumber(this, 'margin-left'), top: obj.y - styleNumber(this, 'margin-top')};
 	},
 
-	position: function(obj){
+	setPosition: function(obj){
 		return this.setStyles(this.computePosition(obj));
 	}
 
@@ -191,6 +192,8 @@ function getCompatElement(element){
 
 //aliases
 
+Element.alias('position', 'setPosition'); //compatability
+
 Native.implement([Window, Document, Element], {
 
 	getHeight: function(){

diff --git a/assets/mootools-core/Source/Fx/Fx.Morph.js b/assets/mootools-core/Source/Fx/Fx.Morph.js
@@ -11,7 +11,6 @@ Fx.Morph = new Class({
 	Extends: Fx.CSS,
 
 	initialize: function(element, options){
-		dbug.log('new MORPH! ', element)
 		this.element = this.subject = $(element);
 		this.parent(options);
 	},