Merge branch 'RB_1.7' of git@gitproxy:glow/glow1 into RB_1.7

Conflicts: CONTRIBUTORS
glow · Apr 20, 2010 · 59ad0f6 · 59ad0f6
2 parents 9dfcc63 + 8b2f04d
commit 59ad0f6
Show file tree

Hide file tree

Showing 16 changed files with 584 additions and 40 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -13,6 +13,6 @@ Tom Yandell
 Ted Littledale
 
 Additional contributors:
-Richard Hubbard
-Gilles Ruppert
+Richard Hubbard
+Gilles Ruppert
 Max Noé
diff --git a/src/anim/anim.js b/src/anim/anim.js
@@ -46,8 +46,9 @@
 		(function() {
 			var queue = [], //running animations
 				queueLen = 0,
-				intervalTime = 1, //ms between intervals
+				intervalTime = 13, //ms between intervals
 				interval; //holds the number for the interval
+
 			manager = {
 				/**
 				@name glow.anim-manager.addToQueue
@@ -591,7 +592,7 @@
 		 		 
 		**/
 		r.fadeIn = function(element, duration, opts){
-			r.fadeTo(element, 1, duration, opts);
+			return r.fadeTo(element, 1, duration, opts);
         };
 
 		/**

diff --git a/src/dom/dom.js b/src/dom/dom.js
@@ -1209,7 +1209,7 @@
 
 				If nodespec is a NodeList, then the its first node will be used.
 
-			@returns {glow.dom.NodeList}
+			@returns {Boolean} True if all NodeList elements are within nodespec
 
 			@example
 				var myNodeList = glow.dom.get("input");

diff --git a/src/dragdrop/dragdrop.js b/src/dragdrop/dragdrop.js
@@ -863,6 +863,7 @@
 			if (opts.onEnter) listeners[i++] = addListener(this, 'enter', this._opts.onEnter, this);
 			if (opts.onLeave) listeners[i++] = addListener(this, 'leave', this._opts.onLeave, this);
 			if (opts.onDrop)  listeners[i++] = addListener(this, 'drop',  this._opts.onDrop,  this);
+			if (opts.onAfterDrop)  listeners[i++] = addListener(this, 'afterDrop',  this._opts.onAfterDrop,  this);
 
 			this._dragListener = addListener(this._handle, 'mousedown', this._startDragMouse, this);
 

diff --git a/src/events/events.js b/src/events/events.js
@@ -372,7 +372,7 @@
 			<dl>
 				<dt>mouseenter</dt>
 				<dd>Fires when the mouse enters this element specifically, does not bubble</dd>
-				<dt>mouseleave/dt>
+				<dt>mouseleave</dt>
 				<dd>Fires when the mouse leaves this element specifically, does not bubble</dd>
 			</dl>
 		
@@ -512,10 +512,13 @@
 		/**
 		@name glow.events.removeListener 
 		@function
-		@description Removes a listener created with addListener
+		@description Removes listener(s) created with addListener
+
+		@param {Number|Number[]} ident An identifier or array of identifiers.
+			Idenftifiers are returned from {@link glow.events.addListener}. 
+
+			If array of identifiers is provided, each listener specified will be removed.
 
-		@param {Number} ident An identifier returned from {@link glow.events.addListener}.
-	
 		@returns {Boolean}
 		
 		@example
@@ -1095,4 +1098,4 @@
 		glow.events = r;
 		glow.events.listenersByObjId = listenersByObjId;
 	}
-});
+});
diff --git a/src/forms/forms.js b/src/forms/forms.js
@@ -47,14 +47,11 @@ glow.forms = {};
 	@param {Object} [opts]
 	@param {Function} [opts.onValidate] Handles the 'validate' event when all tests are complete. Default is glow.forms.feedback.defaultFeedback.
 	@example
-	myForm = new glow.forms.Form(
-		glow.dom.get("#htmlFormId"),
-		{
-			onValidate: function(results) {
-				// ...
-			}
+	myForm = new glow.forms.Form("#htmlFormId" ,{
+		onValidate: function(results) {
+			// ...
 		}
-	);
+	});
  */
 glow.forms.Form = function(formNode, opts) { /*debug*///console.log("glow.forms.Form#new("+formNode+", "+opts+")");
 	/**

diff --git a/src/glow/glow.js b/src/glow/glow.js
@@ -286,12 +286,11 @@
 				glow._removeReadyBlock("widgetsCss");
 			*/
 			_addReadyBlock: function(name) {
-				if (name in glow._readyBlockers) {
-					throw new Error("Blocker '" + name +"' already exists");
+				if ( !glow._readyBlockers[name] ) {
+					glow._readyBlockers[name] = true;
+					glow.isReady = false;
+					blockersActive++;
 				}
-				glow._readyBlockers[name] = true;
-				glow.isReady = false;
-				blockersActive++;
 				return glow;
 			},