Merge branch 'dev' into test

Conflicts:
	.gitignore
	src/dateinput/dateinput.js
	src/scrollable/scrollable.js
	test/dateinput/minimal.htm
	test/overlay/index.htm
	test/scrollable/single.html

Author: tipiirai

.gitignore

@@ -1,7 +1,13 @@
 builder
 build
+<<<<<<< HEAD
 www
 site
+=======
+site
+www
+builder
+>>>>>>> dev
 jquerytools.github.com
 
 # patch

lib/jquery-1.5.min.js

@@ -28,7 +28,8 @@
 			firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
 			min: undefined,
 			max: undefined,
-			trigger: false,
+			trigger: 0,
+			editable: 0,
 
 			css: {
 
@@ -135,7 +136,7 @@
 
 	function parseDate(val) {
 
-		if (!val) { return; }
+		if (val === undefined) { return; }
 		if (val.constructor == Date) { return val; } 
 
 		if (typeof val == 'string') {
@@ -166,6 +167,7 @@
 		// variables
 		var self = this,  
 			 now = new Date(),
+			 yearNow = now.getFullYear(),
 			 css = conf.css,
 			 labels = LABELS[conf.lang],
 			 root = $("#" + css.root),
@@ -176,27 +178,32 @@
 			 value = input.attr("data-value") || conf.value || input.val(), 
 			 min = input.attr("min") || conf.min,  
 			 max = input.attr("max") || conf.max,
-			 opened;
+			 opened,
+			 original;
 
 		// zero min is not undefined 	 
 		if (min === 0) { min = "0"; }
 
 		// use sane values for value, min & max		
-		value = parseDate(value) || now;
-		min   = parseDate(min || conf.yearRange[0] * 365);
-		max   = parseDate(max || conf.yearRange[1] * 365);
+		value = parseDate(value) || now;  
+		
+		min   = parseDate(min || new Date(yearNow + conf.yearRange[0], 1, 1));
+		max   = parseDate(max || new Date( yearNow + conf.yearRange[1]+ 1, 1, -1));
 
 
 		// check that language exists
 		if (!labels) { throw "Dateinput: invalid language: " + conf.lang; }
 
 		// Replace built-in date input: NOTE: input.attr("type", "text") throws exception by the browser
 		if (input.attr("type") == 'date') {
+			
+			original = input.clone();
 			var tmp = $("<input/>");
 
-			$.each("class,disabled,id,maxlength,name,readonly,required,size,style,tabindex,title,value".split(","), function(i, attr)  {
+			$.each("class,disabled,id,maxlength,name,placeholder,readonly,required,size,style,tabindex,title,value".split(","), function(i, attr)  {
 				tmp.attr(attr, input.attr(attr));		
-			});			
+			});		
+			
 			input.replaceWith(tmp);
 			input = tmp;
 		}
@@ -303,8 +310,8 @@
 					return self.hide(e);	
 				}
 
-				// esc key
-				if (key == 27) { return self.hide(e); }						
+				// esc or tab key
+				if (key == 27 || key == 9) { return self.hide(e); }						
 
 				if ($(KEYS).index(key) >= 0) {
 
@@ -614,8 +621,15 @@
 
 			addYear: function(amount) {
 				return this.setValue(currYear + (amount || 1), currMonth, currDay);	
+			},						
+			
+			destroy: function() {
+				input.add(document).unbind("click.d").unbind("keydown.d");
+				root.add(trigger).remove();
+				input.removeData("dateinput").removeClass(css.input);
+				if (original)  { input.replaceWith(original); }
 			},
-						
+			
 			hide: function(e) {				 
 
 				if (opened) {  
@@ -655,22 +669,25 @@
 			}
 
 		}); 
-		
-		// show dateinput & assign keyboard shortcuts
-		input.bind("focus click", self.show).keydown(function(e) {
 
-			var key = e.keyCode;
-	
-			// open dateinput with navigation keyw
-			if (!opened &&  $(KEYS).index(key) >= 0) {
-				self.show(e);
-				return e.preventDefault();
-			} 
-			
-			// allow tab
-			return e.shiftKey || e.ctrlKey || e.altKey || key == 9 ? true : e.preventDefault();   
+		if (!conf.editable) {
 
-		}); 
+			// show dateinput & assign keyboard shortcuts
+			input.bind("focus.d click.d", self.show).keydown(function(e) {
+	
+				var key = e.keyCode;
+		
+				// open dateinput with navigation keyw
+				if (!opened &&  $(KEYS).index(key) >= 0) {
+					self.show(e);
+					return e.preventDefault();
+				} 
+				
+				// allow tab
+				return e.shiftKey || e.ctrlKey || e.altKey || key == 9 ? true : e.preventDefault();   
+				
+			});
+		}
 
 		// initial value 		
 		if (parseDate(input.val())) { 

src/dateinput/dateinput.js

@@ -76,7 +76,7 @@
 			maskConf.closeOnClick = maskConf.closeOnEsc = false;
 		}			 
 
-		// get overlay and triggerr
+		// get overlay and trigger
 		var jq = conf.target || trigger.attr("rel");
 		overlay = jq ? $(jq) : null || trigger;	
 

src/overlay/overlay.js

@@ -176,7 +176,7 @@
 		// Replace built-in range input (type attribute cannot be changed)
 		if (input.attr("type") == 'range') {
 			var tmp = $("<input/>");
-			$.each("class,disabled,id,maxlength,name,readonly,required,size,style,tabindex,title,value".split(","), function(i, attr)  {
+			$.each("class,disabled,id,maxlength,name,placeholder,readonly,required,size,style,tabindex,title,value".split(","), function(i, attr)  {
 				tmp.attr(attr, input.attr(attr));		
 			});
 			tmp.val(conf.value);

src/rangeinput/rangeinput.js

@@ -82,7 +82,7 @@
 			},
 
 			getItems: function() {
-				return itemWrap.children(conf.item).not("." + conf.clonedClass);	
+				return itemWrap.find(conf.item).not("." + conf.clonedClass);	
 			},
 
 			move: function(offset, time) {
@@ -115,6 +115,8 @@
 
 				if (!conf.circular)  {
 					itemWrap.append(item);
+					next.removeClass("disabled");
+					
 				} else {
 					itemWrap.children("." + conf.clonedClass + ":last").before(item);
 					itemWrap.children("." + conf.clonedClass + ":first").replaceWith(item.clone().addClass(conf.clonedClass)); 						
@@ -205,22 +207,28 @@
 
 		// next/prev buttons
 		var prev = find(root, conf.prev).click(function() { self.prev(); }),
-			 next = find(root, conf.next).click(function() { self.next(); });	
+			 next = find(root, conf.next).click(function() { self.next(); }); 
 
-		if (!conf.circular && self.getSize() > 1) {
+		if (!conf.circular) {
 
-			root.bind("onBeforeSeek", function(e, i) {
+			// perform last from the events
+			self.onBeforeSeek(function(e, i) {
+					
 				setTimeout(function() {
 					if (!e.isDefaultPrevented()) {
 						prev.toggleClass(conf.disabledClass, i <= 0);
 						next.toggleClass(conf.disabledClass, i >= self.getSize() -1);
 					}
 				}, 1);
 			}); 
+		}
+		
+		if (!conf.initialIndex) {
+			prev.addClass(conf.disabledClass);	
+		}
 
-			if (!conf.initialIndex) {
-				prev.addClass(conf.disabledClass);	
-			}
+		if (self.getSize() < 2) {
+			prev.add(next).addClass(conf.disabledClass);	
 		}
 
 		// mousewheel support
@@ -262,7 +270,9 @@
 			$(document).bind("keydown.scrollable", function(evt) {
 
 				// skip certain conditions
-				if (!conf.keyboard || evt.altKey || evt.ctrlKey || $(evt.target).is(":input")) { return; }
+				if (!conf.keyboard || evt.altKey || evt.ctrlKey || evt.metaKey || $(evt.target).is(":input")) { 
+					return; 
+				}
 
 				// does this instance have focus?
 				if (conf.keyboard != 'static' && current != self) { return; }

src/scrollable/scrollable.js

@@ -292,7 +292,7 @@
 
 		jQuery.fn.flashembed = function(opts, conf) {		
 			return this.each(function() { 
-				$(this).data("flashembed", flashembed(this, opts, conf));
+				jQuery(this).data("flashembed", flashembed(this, opts, conf));
 			});
 		}; 
 	} 

src/toolbox/toolbox.flashembed.js

@@ -235,13 +235,13 @@
 
 				if (!tip.data("__set")) {
 
-					tip.bind(event[0], function() { 
+					tip.unbind(event[0]).bind(event[0], function() { 
 						clearTimeout(timer);
 						clearTimeout(pretimer);
 					});
 
 					if (event[1] && !trigger.is("input:not(:checkbox, :radio), textarea")) { 					
-						tip.bind(event[1], function(e) {
+						tip.unbind(event[1]).bind(event[1], function(e) {
 
 							// being moved to the trigger element
 							if (e.relatedTarget != trigger[0]) {
@@ -250,7 +250,8 @@
 						}); 
 					} 
 
-					tip.data("__set", true);
+					// bind agein for if same tip element
+					if (!conf.tip) tip.data("__set", true);
 				}
 
 				return self;

src/tooltip/tooltip.js

@@ -510,6 +510,9 @@
 				if (!self.checkValidity(null, e)) { 
 					return e.preventDefault(); 
 				}
+				// Reset event type and target
+				e.target = form;
+				e.type = conf.formEvent;
 			});
 		}
 

src/validator/validator.js

@@ -1,5 +1,5 @@
 
-<script src="../js/jquery-1.4.2.js"></script>
+<script src="../js/jquery-1.5.min.js"></script>
 <script src="../../src/core.js"></script>
 <script src="../../src/dateinput/dateinput.js"></script>
 
@@ -10,6 +10,10 @@
 
 <!-- make it happen -->
 <script>
-$(":date").dateinput({ selectors: true, yearRange: [-10, 10] }).data("dateinput").show();
+$(":date").dateinput({ 
+	selectors: true, 
+	yearRange: [-10, 10]
+
+}).data("dateinput");
 </script>