Simplified app template.

8ad56184 · asudoh · 0c824957 · 8ad56184 · 8ad56184 · 8ad56184
Commit 8ad56184 authored Aug 31, 2012 by asudoh
5 changed files
--- a/architecture-examples/dojo/js/lib/dojo-1.8/dojo.js
+++ b/architecture-examples/dojo/js/lib/dojo-1.8/dojo.js
--- a/architecture-examples/dojo/js/todo/_CssToggleMixin.js
+++ b/architecture-examples/dojo/js/todo/_CssToggleMixin.js
@@ -2,11 +2,12 @@ define([
 	"dojo/_base/array",
 	"dojo/_base/declare",
 	"dojo/_base/lang",
-	"dojo/dom-class"
+	"dojo/dom-class",
-], function(array, declare, lang, domClass){
+	"dijit/_WidgetBase"
-	return declare(null, {
+], function(array, declare, lang, domClass, _WidgetBase){
+	return declare(_WidgetBase, {
 		// summary:
-		//		Mixin class to support widget attributes with classExists type.
+		//		Widget supporting widget attributes with classExists type.
 		//		classExists type allows boolean value of an attribute to reflect existence of a CSS class in a DOM node in the widget.
 		// example:
 		//		In this example, the text will be bold when the check box is checked.
@@ -25,8 +26,7 @@ define([
 		// |			<body>
 		// |				<script type="dojo/require">at: "dojox/mvc/at"</script>
 		// |				<input id="checkbox" data-dojo-type="dijit/form/CheckBox">
-		// |				<div data-dojo-type="dijit/_WidgetBase"
+		// |				<div data-dojo-type="todo/CssToggleWidget"
-		// |				 data-dojo-mixins="todo/_CssToggleMixin"
 		// |				 data-dojo-props="_setBoldAttr: {type: 'classExists', className: 'boldText'},
 		// |				                  bold: at('widget:checkbox', 'checked')">This text will be bold when above check box is checked.</div>
 		// |			</body>

--- a/architecture-examples/dojo/js/todo/TodoList.js
+++ b/architecture-examples/dojo/js/todo/TodoList.js
+define([
+	"dojo/_base/declare",
+	"dijit/_TemplatedMixin",
+	"dijit/_WidgetsInTemplateMixin",
+	"dojox/mvc/WidgetList",
+	"dojox/mvc/_InlineTemplateMixin",
+	"todo/CssToggleWidget",
+	"todo/ctrl/_HashCompletedMixin"
+], function(declare, _TemplatedMixin, _WidgetsInTemplateMixin, WidgetList, _InlineTemplateMixin, CssToggleWidget, _HashCompletedMixin){
+	return declare([WidgetList, _InlineTemplateMixin], {
+		childClz: declare([CssToggleWidget,  _TemplatedMixin, _WidgetsInTemplateMixin, _HashCompletedMixin], {
+			_setCompletedAttr: {type: "classExists", className: "completed"},
+			_setHiddenAttr: {type: "classExists", className: "hidden"},
+			onRemoveClick: function(){
+				this.parent.listCtrl.removeItem(this.uniqueId);
+			},
+			onEditBoxChange: function(){
+				if(!this.editBox.value){
+					this.parent.listCtrl.removeItem(this.uniqueId);
+				}
+			}
+		})
+	});
+});
--- a/architecture-examples/dojo/js/todo/app18.html
+++ b/architecture-examples/dojo/js/todo/app18.html
--- a/architecture-examples/dojo/js/todo/app18.js
+++ b/architecture-examples/dojo/js/todo/app18.js
@@ -4,19 +4,16 @@ define([
 	"dojo/_base/unload",
 	"dojo/keys",
 	"dojo/string",
-	"dijit/_WidgetBase",
 	"dijit/_TemplatedMixin",
 	"dijit/_WidgetsInTemplateMixin",
-	"todo/_CssToggleMixin",
+	"todo/CssToggleWidget",
 	"dojo/text!./app18.html",
 	// Below modules are referred in template.
 	// dijit/_WidgetsInTemplateMixin requires all modules referred in template to have been loaded before it's instantiated.
 	"dijit/form/CheckBox",
 	"dijit/form/TextBox",
 	"dojox/mvc/at",
-	"dojox/mvc/_InlineTemplateMixin",
+	"todo/TodoList",
-	"dojox/mvc/WidgetList",
-	"todo/ctrl/_HashCompletedMixin",
 	"todo/ctrl/RouteController",
 	"todo/ctrl/TodoListRefController",
 	"todo/ctrl/TodoRefController",
@@ -25,22 +22,22 @@ define([
 	"todo/misc/LessThanOrEqualToConverter",
 	"todo/model/SimpleTodoModel",
 	"todo/store/LocalStorage"
-], function(declare, lang, unload, keys, string, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _CssToggleMixin, template){
+], function(declare, lang, unload, keys, string, _TemplatedMixin, _WidgetsInTemplateMixin, CssToggleWidget, template){
-	return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _CssToggleMixin], {
+	return declare([CssToggleWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
 		// summary:
 		//		A widgets-in-template widget that composes the application UI of TodoMVC (Dojo 1.8 version).
-		//		Also, this class inherits todo/_CssToggleMixin so that it can react to change in "present"/"complete" attributes and add/remove CSS class to the root DOM node of this widget.
+		//		Also, this class inherits todo/CssToggleWidget so that it can react to change in "present"/"complete" attributes and add/remove CSS class to the root DOM node of this widget.
 		// templateString: String
 		//		The HTML of widget template.
 		templateString: template,
 		// _setPresentAttr: Object
-		//		A object used by todo/_CssToggleMixin to reflect true/false state of "present" attribute to existence of "todos_present" CSS class in this widget's root DOM.
+		//		A object used by todo/CssToggleWidget to reflect true/false state of "present" attribute to existence of "todos_present" CSS class in this widget's root DOM.
 		_setPresentAttr: {type: "classExists", className: "todos_present"},
 		// _setCompleteAttr: Object
-		//		A object used by todo/_CssToggleMixin to reflect true/false state of "complete" attribute to existence of "todos_selected" CSS class in this widget's root DOM.
+		//		A object used by todo/CssToggleWidget to reflect true/false state of "complete" attribute to existence of "todos_selected" CSS class in this widget's root DOM.
 		_setCompleteAttr: {type: "classExists", className: "todos_selected"},
 		startup: function(){