Hash: Add transition support

rxaviers · May 9, 2013 · c74f6f4 · c74f6f4
1 parent 2f48de4
commit c74f6f4
Showing 1 changed file with 38 additions and 7 deletions.
diff --git a/ui/jquery.ui.hash.js b/ui/jquery.ui.hash.js
@@ -8,8 +8,8 @@
  * http://docs.jquery.com/UI/Hash (to be created)
  *
  * Depends:
- *	jquery.ui.core.js
+ *  jquery.ui.core.js
- *	jquery.ui.widget.js
+ *  jquery.ui.widget.js
  */
 (function( $, undefined ) {
 
@@ -22,18 +22,49 @@ $.widget( "ui.hash", {
 	options: {
 	},
 
+	elements: function() {
+		var elements = $([]);
+		$.each(this.els, function() {
+			elements = elements.add(this);
+		});
+		return elements;
+	},
+
 	set: function(key, el) {
+		el = $(el);
 		this.destroy(key);
 		this.els[key] = el;
+		if($.support.transition) {
+			el.addClass("fade");
+		}
 	},
 
-	show: function(key) {
+	show: function(key, cb) {
-		this.clear();
+		var self = this;
-		this.element.html(this.els[key]);
+		this.clear(function() {
+			self.element.html(self.els[key]);
+			if($.support.transition) {
+				self.els[key].addClass("in");
+			}
+			if(cb) {
+				cb();
+			}
+		});
 	},
 
-	clear: function(ev, key) {
+	clear: function(cb) {
-		this.element.children().detach();
+		if($.support.transition && this.elements().hasClass("in")) {
+			var self = this;
+			this.elements().filter(".in")
+				.one($.support.transition.end, function(ev) {
+					self.element.children().detach();
+					cb && cb();
+				})
+				.removeClass("in");
+		} else {
+			this.element.children().detach();
+			cb && cb();
+		}
 	},
 
 	destroy: function(key) {