DojoCalendar

analytics/_base.js

@@ -43,12 +43,7 @@ define(["dojo/_base/lang", "dojo/_base/config", "dojo/ready", "dojo/_base/unload
 			//	data push
 
 			if(arguments.length > 2){
-				// FIXME: var c = dojo._toArray(arguments) ?
-				var c = [];
-				for(var i = 1; i < arguments.length; i++){
-					c.push(arguments[i]);
-				}
-				data = c;
+				data = Array.prototype.slice.call(arguments,1);
 			}
 
 			this._data.push({ plugin: dataType, data: data });

analytics/plugins/consoleMessages.js

@@ -4,22 +4,21 @@ define(["dojo/_base/lang","../_base", "dojo/_base/config", "dojo/aspect"
 		dxa = dojox.analytics;
 		aspect = dojo.aspect;
 	=====*/
-	consoleMessages = lang.getObject("dojox.analytics.plugins.consoleMessages", true);
+	var consoleMessages = lang.getObject("dojox.analytics.plugins.consoleMessages", true);
 
 		// summary:
 		//	plugin to have analyitcs return the base info dojo collects
 		this.addData = lang.hitch(dxa, "addData", "consoleMessages");
 
 		var lvls = config["consoleLogFuncs"] || ["error", "warn", "info", "rlog"];
-		if(!console){
-			console = {};
-		}
+		console || (console={});
 
 		for(var i = 0; i < lvls.length; i++){
-			if(console[lvls[i]]){
-				aspect.after(console, lvls[i], lang.hitch(this, "addData", lvls[i]),true);
+			var fnName=lvls[i], _addData=lang.hitch(this, "addData", fnName);
+			if(console[fnName]){
+				aspect.after(console, fnName, _addData , true);
 			}else{
-				console[lvls[i]] = lang.hitch(this, "addData", lvls[i]);
+				console[fnName] = _addData;
 			}
 		}
 	return consoleMessages;

calc/Grapher.js

@@ -233,7 +233,7 @@ define([
 			td.appendChild(d);
 
 			d = domConstruct.create('div');
-			domStyle.set(d, { position: "absolute", left: "0px", top: "0px" })
+			domStyle.set(d, { position: "absolute", left: "0px", top: "0px" });
 			this.chartsParent.appendChild(d);
 			this.array[tr.rowIndex][this.chartNodeIndex] = d;
 			domClass.add(d, "dojoxCalcChart");
@@ -497,7 +497,7 @@ define([
 
 						points2[s].push(p);
 						// setup the next series
-						points2[++s] = []
+						points2[++s] = [];
 					}
 					var startK = k;
 					while(k < points.length && (points[k][y] > maxY || points[k][y] < minY)){

calc/Standard.js

@@ -354,7 +354,7 @@ define([
 			//onClick="this.insertText(document.getElementById('textbox'), '\u221A')"
 			//this.sqrt.set("onClick", lang.hitch(this, "insertText", this.textboxWidget, '\u221A'));
 			//this.pi.set("onClick", lang.hitch(this, "insertText", this.textboxWidget, '\u03C0'));
-			this.startup()
+			this.startup();
 		}
 	});
 

calendar/Calendar.js

@@ -0,0 +1,75 @@
+define(["dojo/_base/declare", "dojo/_base/lang", "./CalendarBase", "./ColumnView", "./ColumnViewSecondarySheet", 
+				"./VerticalRenderer", "./MatrixView",	"./HorizontalRenderer", "./LabelRenderer", 
+				"./ExpandRenderer", "./Keyboard", "./Mouse", "dojo/text!./templates/Calendar.html", 
+				"dijit/form/Button", "dijit/Toolbar", "dijit/ToolbarSeparator"],
+
+	function(declare, lang, CalendarBase, ColumnView, ColumnViewSecondarySheet, VerticalRenderer, 
+					 MatrixView, HorizontalRenderer, LabelRenderer, ExpandRenderer, Keyboard, Mouse, template){
+
+	/*=====
+		var CalendarBase = dojox.calendar.CalendarBase;
+		var ColumnView = dojox.calendar.ColumnView;
+		var ColumnViewSecondarySheet = dojox.calendar.ColumnViewSecondarySheet;
+		var MatrixView = dojox.calendar.MatrixView;
+		var VerticalRenderer = dojox.calendar.VerticalRenderer;
+		var HorizontalRenderer = dojox.calendar.HorizontalRenderer;
+		var LabelRenderer = dojox.calendar.LabelRenderer;
+		var ExpandRenderer = dojox.calendar.ExpandRenderer;
+		var Keyboard = dojox.calendar.Keyboard;
+		var Mouse = dojox.calendar.Mouse;
+	=====*/ 
+
+	return declare("dojox.calendar.Calendar", CalendarBase, {
+
+		templateString: template,
+
+		// module:
+		//		dojox/calendar/Calendar
+		// summary:
+		//		dojox.calendar.Calendar widget
+		//		This class defines a calendar widget that display events in time.
+
+		_createDefaultViews: function(){
+			//	summary:
+			//		Creates the default views:
+			//		|	A ColumnView instance used to display one day to seven days time intervals,
+			//		| A MatrixView instance used to display the other time intervals.
+			//		The views are mixed with Mouse and Keyboard to allow editing items using mouse and keyboard.
+
+			var secondarySheetClass = declare([ColumnViewSecondarySheet, Keyboard, Mouse]);
+
+			var colView = declare([ColumnView, Keyboard, Mouse])(lang.mixin({
+				secondarySheetClass: secondarySheetClass,
+				verticalRenderer: VerticalRenderer,
+				horizontalRenderer: HorizontalRenderer,
+				expandRenderer: ExpandRenderer
+			}, this.columnViewProps));
+
+			var matrixView = declare([MatrixView, Keyboard, Mouse])(lang.mixin({							
+				horizontalRenderer: HorizontalRenderer,
+				labelRenderer: LabelRenderer,
+				expandRenderer: ExpandRenderer
+			}, this.matrixViewProps));
+
+			this.columnView = colView;
+			this.matrixView = matrixView;
+
+			var views = [colView, matrixView];
+
+			this.installDefaultViewsActions(views);
+
+			return views;
+		},
+
+		installDefaultViewsActions: function(views){
+			//	summary:
+			//		Installs the default actions on newly created default views.
+			//		By default this action is registering:
+			//		| the matrixViewRowHeaderClick method	on the rowHeaderClick event of the matrix view.
+			//		| the columnViewColumnHeaderClick method	on the columnHeaderClick event of the column view.
+			this.matrixView.on("rowHeaderClick", lang.hitch(this, this.matrixViewRowHeaderClick));
+			this.columnView.on("columnHeaderClick", lang.hitch(this, this.columnViewColumnHeaderClick));			
+		}
+
+	}) 
+});