Merge branch 'master' of github.com:enyojs/enyo

MaKleSoft · May 10, 2012 · 3c4c6b3 · 3c4c6b3
2 parents eb5a288 + 36e2589
commit 3c4c6b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/source/ui/Checkbox.js b/source/ui/Checkbox.js
@@ -5,9 +5,6 @@ enyo.kind({
 	name: "enyo.Checkbox",
 	//* @protected
 	kind: enyo.Input,
-	attributes: {
-		type: "checkbox"
-	},
 	events: {
 		onActivate: ""
 	},
@@ -16,7 +13,9 @@ enyo.kind({
 		//* Value of the checkbox
 		checked: false,
 		//* Group API requirement for determining selected item
-		active: false
+		active: false,
+		//* @protected
+		type: "checkbox"
 	},
 	//* @protected
 	handlers: {
@@ -42,7 +41,6 @@ enyo.kind({
 		this.active = Boolean(this.active);
 		this.setChecked(this.active);
 		this.bubble("onActivate");
-		this.notifyContainer();
 	},
 	// all input type controls support 'value' property
 	setValue: function(inValue) {

diff --git a/source/ui/Input.js b/source/ui/Input.js
@@ -15,8 +15,6 @@ enyo.kind({
 		disabled: false
 	},
 	events: {
-		//* Sent when the input's value has changed, support for IE included.
-		onRealtimeChange: "",
 		//* Sent when the input's is disabled or enabled.
 		onDisabledChange: ""
 	},
@@ -68,7 +66,6 @@ enyo.kind({
 	valueChanged: function() {
 		this.setAttribute("value", this.value);
 		this.setNodeProperty("value", this.value);
-		this.notifyContainer();
 	},
 	iekeyup: function(inSender, inEvent) {
 		var ie = enyo.platform.ie, kc = inEvent.keyCode;
@@ -77,12 +74,6 @@ enyo.kind({
 			this.bubble("oninput", inEvent);
 		}
 	},
-	input: function() {
-		this.notifyContainer();
-	},
-	notifyContainer: function() {
-		this.bubble("onRealtimeChange");
-	},
 	clear: function() {
 		this.setValue("");
 	},