dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/dnd/Mover.js

@@ -5,26 +5,27 @@
 */
 
 //>>built
-define("dojo/dnd/Mover",["../main","../Evented","../touch","./common","./autoscroll"],function(_1,_2,_3){
-_1.declare("dojo.dnd.Mover",[_2],{constructor:function(_4,e,_5){
-this.node=_1.byId(_4);
+define("dojo/dnd/Mover",["../_base/array","../_base/declare","../_base/event","../_base/lang","../sniff","../_base/window","../dom","../dom-geometry","../dom-style","../Evented","../on","../touch","./common","./autoscroll"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,on,_b,_c,_d){
+return _2("dojo.dnd.Mover",[_a],{constructor:function(_e,e,_f){
+this.node=_7.byId(_e);
 this.marginBox={l:e.pageX,t:e.pageY};
 this.mouseButton=e.button;
-var h=(this.host=_5),d=_4.ownerDocument;
-this.events=[_1.connect(d,_3.move,this,"onFirstMove"),_1.connect(d,_3.move,this,"onMouseMove"),_1.connect(d,_3.release,this,"onMouseUp"),_1.connect(d,"ondragstart",_1.stopEvent),_1.connect(d.body,"onselectstart",_1.stopEvent)];
+var h=(this.host=_f),d=_e.ownerDocument;
+this.events=[on(d,_b.move,_4.hitch(this,"onFirstMove")),on(d,_b.move,_4.hitch(this,"onMouseMove")),on(d,_b.release,_4.hitch(this,"onMouseUp")),on(d,"dragstart",_3.stop),on(d.body,"selectstart",_3.stop)];
+_d.autoScrollStart(d);
 if(h&&h.onMoveStart){
 h.onMoveStart(this);
 }
 },onMouseMove:function(e){
-_1.dnd.autoScroll(e);
+_d.autoScroll(e);
 var m=this.marginBox;
 this.host.onMove(this,{l:m.l+e.pageX,t:m.t+e.pageY},e);
-_1.stopEvent(e);
+_3.stop(e);
 },onMouseUp:function(e){
-if(_1.isWebKit&&_1.isMac&&this.mouseButton==2?e.button==0:this.mouseButton==e.button){
+if(_5("webkit")&&_5("mac")&&this.mouseButton==2?e.button==0:this.mouseButton==e.button){
 this.destroy();
 }
-_1.stopEvent(e);
+_3.stop(e);
 },onFirstMove:function(e){
 var s=this.node.style,l,t,h=this.host;
 switch(s.position){
@@ -35,11 +36,11 @@ t=Math.round(parseFloat(s.top))||0;
 break;
 default:
 s.position="absolute";
-var m=_1.marginBox(this.node);
-var b=_1.doc.body;
-var bs=_1.getComputedStyle(b);
-var bm=_1._getMarginBox(b,bs);
-var bc=_1._getContentBox(b,bs);
+var m=_8.getMarginBox(this.node);
+var b=_6.doc.body;
+var bs=_9.getComputedStyle(b);
+var bm=_8.getMarginBox(b,bs);
+var bc=_8.getContentBox(b,bs);
 l=m.l-(bc.l-bm.l);
 t=m.t-(bc.t-bm.t);
 break;
@@ -49,14 +50,15 @@ this.marginBox.t=t-this.marginBox.t;
 if(h&&h.onFirstMove){
 h.onFirstMove(this,e);
 }
-_1.disconnect(this.events.shift());
+this.events.shift().remove();
 },destroy:function(){
-_1.forEach(this.events,_1.disconnect);
+_1.forEach(this.events,function(_10){
+_10.remove();
+});
 var h=this.host;
 if(h&&h.onMoveStop){
 h.onMoveStop(this);
 }
 this.events=this.node=this.host=null;
 }});
-return _1.dnd.Mover;
 });

data/vendor/assets/javascripts/dojo/dnd/Mover.js.uncompressed.js

@@ -1,15 +1,17 @@
-define("dojo/dnd/Mover", ["../main", "../Evented", "../touch", "./common", "./autoscroll"], function(dojo, Evented, touch) {
-	// module:
-	//		dojo/dnd/Mover
-	// summary:
-	//		TODOC
+define("dojo/dnd/Mover", [
+	"../_base/array", "../_base/declare", "../_base/event", "../_base/lang", "../sniff", "../_base/window",
+	"../dom", "../dom-geometry", "../dom-style", "../Evented", "../on", "../touch", "./common", "./autoscroll"
+], function(array, declare, event, lang, has, win, dom, domGeom, domStyle, Evented, on, touch, dnd, autoscroll){
+
+// module:
+//		dojo/dnd/Mover
 
+return declare("dojo.dnd.Mover", [Evented], {
+	// summary:
+	//		an object which makes a node follow the mouse, or touch-drag on touch devices.
+	//		Used as a default mover, and as a base class for custom movers.
 
-dojo.declare("dojo.dnd.Mover", [Evented], {
 	constructor: function(node, e, host){
-		// summary:
-		//		an object which makes a node follow the mouse, or touch-drag on touch devices.
-		//		Used as a default mover, and as a base class for custom movers.
 		// node: Node
 		//		a node (or node's id) to be moved
 		// e: Event
@@ -18,25 +20,29 @@ dojo.declare("dojo.dnd.Mover", [Evented], {
 		// host: Object?
 		//		object which implements the functionality of the move,
 		//	 	and defines proper events (onMoveStart and onMoveStop)
-		this.node = dojo.byId(node);
+		this.node = dom.byId(node);
 		this.marginBox = {l: e.pageX, t: e.pageY};
 		this.mouseButton = e.button;
 		var h = (this.host = host), d = node.ownerDocument;
 		this.events = [
-			// At the start of a drag, onFirstMove is called, and then the following two
-			// connects are disconnected
-			dojo.connect(d, touch.move, this, "onFirstMove"),
+			// At the start of a drag, onFirstMove is called, and then the following
+			// listener is disconnected.
+			on(d, touch.move, lang.hitch(this, "onFirstMove")),
 
 			// These are called continually during the drag
-			dojo.connect(d, touch.move, this, "onMouseMove"),
+			on(d, touch.move, lang.hitch(this, "onMouseMove")),
 
 			// And these are called at the end of the drag
-			dojo.connect(d, touch.release,   this, "onMouseUp"),
+			on(d, touch.release,  lang.hitch(this, "onMouseUp")),
 
 			// cancel text selection and text dragging
-			dojo.connect(d, "ondragstart",   dojo.stopEvent),
-			dojo.connect(d.body, "onselectstart", dojo.stopEvent)
+			on(d, "dragstart",   event.stop),
+			on(d.body, "selectstart", event.stop)
 		];
+
+		// Tell autoscroll that a drag is starting
+		autoscroll.autoScrollStart(d);
+
 		// notify that the move has started
 		if(h && h.onMoveStart){
 			h.onMoveStart(this);
@@ -48,23 +54,23 @@ dojo.declare("dojo.dnd.Mover", [Evented], {
 		//		event processor for onmousemove/ontouchmove
 		// e: Event
 		//		mouse/touch event
-		dojo.dnd.autoScroll(e);
+		autoscroll.autoScroll(e);
 		var m = this.marginBox;
 		this.host.onMove(this, {l: m.l + e.pageX, t: m.t + e.pageY}, e);
-		dojo.stopEvent(e);
+		event.stop(e);
 	},
 	onMouseUp: function(e){
-		if(dojo.isWebKit && dojo.isMac && this.mouseButton == 2 ?
+		if(has("webkit") && has("mac") && this.mouseButton == 2 ?
 				e.button == 0 : this.mouseButton == e.button){ // TODO Should condition be met for touch devices, too?
 			this.destroy();
 		}
-		dojo.stopEvent(e);
+		event.stop(e);
 	},
 	// utilities
 	onFirstMove: function(e){
 		// summary:
 		//		makes the node absolute; it is meant to be called only once.
-		// 		relative and absolutely positioned nodes are assumed to use pixel units
+		//		relative and absolutely positioned nodes are assumed to use pixel units
 		var s = this.node.style, l, t, h = this.host;
 		switch(s.position){
 			case "relative":
@@ -75,19 +81,19 @@ dojo.declare("dojo.dnd.Mover", [Evented], {
 				break;
 			default:
 				s.position = "absolute";	// enforcing the absolute mode
-				var m = dojo.marginBox(this.node);
+				var m = domGeom.getMarginBox(this.node);
 				// event.pageX/pageY (which we used to generate the initial
 				// margin box) includes padding and margin set on the body.
 				// However, setting the node's position to absolute and then
-				// doing dojo.marginBox on it *doesn't* take that additional
+				// doing domGeom.marginBox on it *doesn't* take that additional
 				// space into account - so we need to subtract the combined
 				// padding and margin.  We use getComputedStyle and
 				// _getMarginBox/_getContentBox to avoid the extra lookup of
 				// the computed style.
-				var b = dojo.doc.body;
-				var bs = dojo.getComputedStyle(b);
-				var bm = dojo._getMarginBox(b, bs);
-				var bc = dojo._getContentBox(b, bs);
+				var b = win.doc.body;
+				var bs = domStyle.getComputedStyle(b);
+				var bm = domGeom.getMarginBox(b, bs);
+				var bc = domGeom.getContentBox(b, bs);
 				l = m.l - (bc.l - bm.l);
 				t = m.t - (bc.t - bm.t);
 				break;
@@ -98,13 +104,13 @@ dojo.declare("dojo.dnd.Mover", [Evented], {
 			h.onFirstMove(this, e);
 		}
 
-		// Disconnect onmousemove and ontouchmove events that call this function
-		dojo.disconnect(this.events.shift());
+		// Disconnect touch.move that call this function
+		this.events.shift().remove();
 	},
 	destroy: function(){
 		// summary:
 		//		stops the move, deletes all references, so the object can be garbage-collected
-		dojo.forEach(this.events, dojo.disconnect);
+		array.forEach(this.events, function(handle){ handle.remove(); });
 		// undo global settings
 		var h = this.host;
 		if(h && h.onMoveStop){
@@ -115,5 +121,4 @@ dojo.declare("dojo.dnd.Mover", [Evented], {
 	}
 });
 
-return dojo.dnd.Mover;
 });

data/vendor/assets/javascripts/dojo/dnd/Selector.js

@@ -5,51 +5,51 @@
 */
 
 //>>built
-define("dojo/dnd/Selector",["../main","./common","./Container"],function(_1){
-_1.declare("dojo.dnd.Selector",_1.dnd.Container,{constructor:function(_2,_3){
-if(!_3){
-_3={};
+define("dojo/dnd/Selector",["../_base/array","../_base/declare","../_base/event","../_base/kernel","../_base/lang","../dom","../dom-construct","../mouse","../_base/NodeList","../on","../touch","./common","./Container"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,on,_a,_b,_c){
+var _d=_2("dojo.dnd.Selector",_c,{constructor:function(_e,_f){
+if(!_f){
+_f={};
 }
-this.singular=_3.singular;
-this.autoSync=_3.autoSync;
+this.singular=_f.singular;
+this.autoSync=_f.autoSync;
 this.selection={};
 this.anchor=null;
 this.simpleSelection=false;
-this.events.push(_1.connect(this.node,"onmousedown",this,"onMouseDown"),_1.connect(this.node,"onmouseup",this,"onMouseUp"));
+this.events.push(on(this.node,_a.press,_5.hitch(this,"onMouseDown")),on(this.node,_a.release,_5.hitch(this,"onMouseUp")));
 },singular:false,getSelectedNodes:function(){
-var t=new _1.NodeList();
-var e=_1.dnd._empty;
+var t=new _9();
+var e=_b._empty;
 for(var i in this.selection){
 if(i in e){
 continue;
 }
-t.push(_1.byId(i));
+t.push(_6.byId(i));
 }
 return t;
 },selectNone:function(){
 return this._removeSelection()._removeAnchor();
 },selectAll:function(){
-this.forInItems(function(_4,id){
-this._addItemClass(_1.byId(id),"Selected");
+this.forInItems(function(_10,id){
+this._addItemClass(_6.byId(id),"Selected");
 this.selection[id]=1;
 },this);
 return this._removeAnchor();
 },deleteSelectedNodes:function(){
-var e=_1.dnd._empty;
+var e=_b._empty;
 for(var i in this.selection){
 if(i in e){
 continue;
 }
-var n=_1.byId(i);
+var n=_6.byId(i);
 this.delItem(i);
-_1.destroy(n);
+_7.destroy(n);
 }
 this.anchor=null;
 this.selection={};
 return this;
 },forInSelectedItems:function(f,o){
-o=o||_1.global;
-var s=this.selection,e=_1.dnd._empty;
+o=o||_4.global;
+var s=this.selection,e=_b._empty;
 for(var i in s){
 if(i in e){
 continue;
@@ -57,13 +57,13 @@ continue;
 f.call(o,this.getItem(i),i,this);
 }
 },sync:function(){
-_1.dnd.Selector.superclass.sync.call(this);
+_d.superclass.sync.call(this);
 if(this.anchor){
 if(!this.getItem(this.anchor.id)){
 this.anchor=null;
 }
 }
-var t=[],e=_1.dnd._empty;
+var t=[],e=_b._empty;
 for(var i in this.selection){
 if(i in e){
 continue;
@@ -76,11 +76,11 @@ _1.forEach(t,function(i){
 delete this.selection[i];
 },this);
 return this;
-},insertNodes:function(_5,_6,_7,_8){
-var _9=this._normalizedCreator;
-this._normalizedCreator=function(_a,_b){
-var t=_9.call(this,_a,_b);
-if(_5){
+},insertNodes:function(_11,_12,_13,_14){
+var _15=this._normalizedCreator;
+this._normalizedCreator=function(_16,_17){
+var t=_15.call(this,_16,_17);
+if(_11){
 if(!this.anchor){
 this.anchor=t.node;
 this._removeItemClass(t.node,"Selected");
@@ -98,11 +98,11 @@ this._removeItemClass(t.node,"Anchor");
 }
 return t;
 };
-_1.dnd.Selector.superclass.insertNodes.call(this,_6,_7,_8);
-this._normalizedCreator=_9;
+_d.superclass.insertNodes.call(this,_12,_13,_14);
+this._normalizedCreator=_15;
 return this;
 },destroy:function(){
-_1.dnd.Selector.superclass.destroy.call(this);
+_d.superclass.destroy.call(this);
 this.selection=this.anchor=null;
 },onMouseDown:function(e){
 if(this.autoSync){
@@ -111,15 +111,15 @@ this.sync();
 if(!this.current){
 return;
 }
-if(!this.singular&&!_1.isCopyKey(e)&&!e.shiftKey&&(this.current.id in this.selection)){
+if(!this.singular&&!_b.getCopyKeyState(e)&&!e.shiftKey&&(this.current.id in this.selection)){
 this.simpleSelection=true;
-if(e.button===_1.mouseButtons.LEFT){
-_1.stopEvent(e);
+if(_8.isLeft(e)){
+_3.stop(e);
 }
 return;
 }
 if(!this.singular&&e.shiftKey){
-if(!_1.isCopyKey(e)){
+if(!_b.getCopyKeyState(e)){
 this._removeSelection();
 }
 var c=this.getAllNodes();
@@ -130,20 +130,20 @@ this._addItemClass(this.anchor,"Anchor");
 }
 this.selection[this.anchor.id]=1;
 if(this.anchor!=this.current){
-var i=0;
+var i=0,_18;
 for(;i<c.length;++i){
-var _c=c[i];
-if(_c==this.anchor||_c==this.current){
+_18=c[i];
+if(_18==this.anchor||_18==this.current){
 break;
 }
 }
 for(++i;i<c.length;++i){
-var _c=c[i];
-if(_c==this.anchor||_c==this.current){
+_18=c[i];
+if(_18==this.anchor||_18==this.current){
 break;
 }
-this._addItemClass(_c,"Selected");
-this.selection[_c.id]=1;
+this._addItemClass(_18,"Selected");
+this.selection[_18.id]=1;
 }
 this._addItemClass(this.current,"Selected");
 this.selection[this.current.id]=1;
@@ -152,7 +152,7 @@ this.selection[this.current.id]=1;
 }else{
 if(this.singular){
 if(this.anchor==this.current){
-if(_1.isCopyKey(e)){
+if(_b.getCopyKeyState(e)){
 this.selectNone();
 }
 }else{
@@ -162,7 +162,7 @@ this._addItemClass(this.anchor,"Anchor");
 this.selection[this.current.id]=1;
 }
 }else{
-if(_1.isCopyKey(e)){
+if(_b.getCopyKeyState(e)){
 if(this.anchor==this.current){
 delete this.selection[this.anchor.id];
 this._removeAnchor();
@@ -190,8 +190,8 @@ this.selection[this.current.id]=1;
 }
 }
 }
-_1.stopEvent(e);
-},onMouseUp:function(e){
+_3.stop(e);
+},onMouseUp:function(){
 if(!this.simpleSelection){
 return;
 }
@@ -202,22 +202,24 @@ this.anchor=this.current;
 this._addItemClass(this.anchor,"Anchor");
 this.selection[this.current.id]=1;
 }
-},onMouseMove:function(e){
+},onMouseMove:function(){
 this.simpleSelection=false;
 },onOverEvent:function(){
-this.onmousemoveEvent=_1.connect(this.node,"onmousemove",this,"onMouseMove");
+this.onmousemoveEvent=on(this.node,_a.move,_5.hitch(this,"onMouseMove"));
 },onOutEvent:function(){
-_1.disconnect(this.onmousemoveEvent);
+if(this.onmousemoveEvent){
+this.onmousemoveEvent.remove();
 delete this.onmousemoveEvent;
+}
 },_removeSelection:function(){
-var e=_1.dnd._empty;
+var e=_b._empty;
 for(var i in this.selection){
 if(i in e){
 continue;
 }
-var _d=_1.byId(i);
-if(_d){
-this._removeItemClass(_d,"Selected");
+var _19=_6.byId(i);
+if(_19){
+this._removeItemClass(_19,"Selected");
 }
 }
 this.selection={};
@@ -229,5 +231,5 @@ this.anchor=null;
 }
 return this;
 }});
-return _1.dnd.Selector;
+return _d;
 });

data/vendor/assets/javascripts/dojo/dnd/Selector.js.uncompressed.js

@@ -1,9 +1,10 @@
-define("dojo/dnd/Selector", ["../main", "./common", "./Container"], function(dojo) {
-	// module:
-	//		dojo/dnd/Selector
-	// summary:
-	//		TODOC
+define("dojo/dnd/Selector", [
+	"../_base/array", "../_base/declare", "../_base/event", "../_base/kernel", "../_base/lang",
+	"../dom", "../dom-construct", "../mouse", "../_base/NodeList", "../on", "../touch", "./common", "./Container"
+], function(array, declare, event, kernel, lang, dom, domConstruct, mouse, NodeList, on, touch, dnd, Container){
 
+// module:
+//		dojo/dnd/Selector
 
 /*
 	Container item states:
@@ -13,18 +14,18 @@ define("dojo/dnd/Selector", ["../main", "./common", "./Container"], function(doj
 */
 
 /*=====
-dojo.declare("dojo.dnd.__SelectorArgs", [dojo.dnd.__ContainerArgs], {
-	//	singular: Boolean
+var __SelectorArgs = declare([Container.__ContainerArgs], {
+	// singular: Boolean
 	//		allows selection of only one element, if true
 	singular: false,
 
-	//	autoSync: Boolean
+	// autoSync: Boolean
 	//		autosynchronizes the source with its list of DnD nodes,
 	autoSync: false
 });
 =====*/
 
-dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
+var Selector = declare("dojo.dnd.Selector", Container, {
 	// summary:
 	//		a Selector object, which knows how to select its children
 
@@ -41,7 +42,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		//		constructor of the Selector
 		// node: Node||String
 		//		node or node's id to build the selector on
-		// params: dojo.dnd.__SelectorArgs?
+		// params: __SelectorArgs?
 		//		a dictionary of parameters
 		if(!params){ params = {}; }
 		this.singular = params.singular;
@@ -52,8 +53,9 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		this.simpleSelection = false;
 		// set up events
 		this.events.push(
-			dojo.connect(this.node, "onmousedown", this, "onMouseDown"),
-			dojo.connect(this.node, "onmouseup",   this, "onMouseUp"));
+			on(this.node, touch.press, lang.hitch(this, "onMouseDown")),
+			on(this.node, touch.release, lang.hitch(this, "onMouseUp"))
+		);
 	},
 
 	// object attributes (for markup)
@@ -63,11 +65,11 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	getSelectedNodes: function(){
 		// summary:
 		//		returns a list (an array) of selected nodes
-		var t = new dojo.NodeList();
-		var e = dojo.dnd._empty;
+		var t = new NodeList();
+		var e = dnd._empty;
 		for(var i in this.selection){
 			if(i in e){ continue; }
-			t.push(dojo.byId(i));
+			t.push(dom.byId(i));
 		}
 		return t;	// NodeList
 	},
@@ -80,7 +82,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		// summary:
 		//		selects all items
 		this.forInItems(function(data, id){
-			this._addItemClass(dojo.byId(id), "Selected");
+			this._addItemClass(dom.byId(id), "Selected");
 			this.selection[id] = 1;
 		}, this);
 		return this._removeAnchor();	// self
@@ -88,12 +90,12 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	deleteSelectedNodes: function(){
 		// summary:
 		//		deletes all selected items
-		var e = dojo.dnd._empty;
+		var e = dnd._empty;
 		for(var i in this.selection){
 			if(i in e){ continue; }
-			var n = dojo.byId(i);
+			var n = dom.byId(i);
 			this.delItem(i);
-			dojo.destroy(n);
+			domConstruct.destroy(n);
 		}
 		this.anchor = null;
 		this.selection = {};
@@ -102,9 +104,9 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	forInSelectedItems: function(/*Function*/ f, /*Object?*/ o){
 		// summary:
 		//		iterates over selected items;
-		//		see `dojo.dnd.Container.forInItems()` for details
-		o = o || dojo.global;
-		var s = this.selection, e = dojo.dnd._empty;
+		//		see `dojo/dnd/Container.forInItems()` for details
+		o = o || kernel.global;
+		var s = this.selection, e = dnd._empty;
 		for(var i in s){
 			if(i in e){ continue; }
 			f.call(o, this.getItem(i), i, this);
@@ -114,7 +116,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		// summary:
 		//		sync up the node list with the data map
 
-		dojo.dnd.Selector.superclass.sync.call(this);
+		Selector.superclass.sync.call(this);
 
 		// fix the anchor
 		if(this.anchor){
@@ -124,14 +126,14 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		}
 
 		// fix the selection
-		var t = [], e = dojo.dnd._empty;
+		var t = [], e = dnd._empty;
 		for(var i in this.selection){
 			if(i in e){ continue; }
 			if(!this.getItem(i)){
 				t.push(i);
 			}
 		}
-		dojo.forEach(t, function(i){
+		array.forEach(t, function(i){
 			delete this.selection[i];
 		}, this);
 
@@ -139,7 +141,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	},
 	insertNodes: function(addSelected, data, before, anchor){
 		// summary:
-		//		inserts new data items (see `dojo.dnd.Container.insertNodes()` method for details)
+		//		inserts new data items (see `dojo/dnd/Container.insertNodes()` method for details)
 		// addSelected: Boolean
 		//		all new nodes will be added to selected items, if true, no selection change otherwise
 		// data: Array
@@ -167,14 +169,14 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 			}
 			return t;
 		};
-		dojo.dnd.Selector.superclass.insertNodes.call(this, data, before, anchor);
+		Selector.superclass.insertNodes.call(this, data, before, anchor);
 		this._normalizedCreator = oldCreator;
 		return this;	// self
 	},
 	destroy: function(){
 		// summary:
 		//		prepares the object to be garbage-collected
-		dojo.dnd.Selector.superclass.destroy.call(this);
+		Selector.superclass.destroy.call(this);
 		this.selection = this.anchor = null;
 	},
 
@@ -186,17 +188,17 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		//		mouse event
 		if(this.autoSync){ this.sync(); }
 		if(!this.current){ return; }
-		if(!this.singular && !dojo.isCopyKey(e) && !e.shiftKey && (this.current.id in this.selection)){
+		if(!this.singular && !dnd.getCopyKeyState(e) && !e.shiftKey && (this.current.id in this.selection)){
 			this.simpleSelection = true;
-			if(e.button === dojo.mouseButtons.LEFT){
+			if(mouse.isLeft(e)){
 				// accept the left button and stop the event
 				// for IE we don't stop event when multiple buttons are pressed
-				dojo.stopEvent(e);
+				event.stop(e);
 			}
 			return;
 		}
 		if(!this.singular && e.shiftKey){
-			if(!dojo.isCopyKey(e)){
+			if(!dnd.getCopyKeyState(e)){
 				this._removeSelection();
 			}
 			var c = this.getAllNodes();
@@ -207,13 +209,13 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 				}
 				this.selection[this.anchor.id] = 1;
 				if(this.anchor != this.current){
-					var i = 0;
+					var i = 0, node;
 					for(; i < c.length; ++i){
-						var node = c[i];
+						node = c[i];
 						if(node == this.anchor || node == this.current){ break; }
 					}
 					for(++i; i < c.length; ++i){
-						var node = c[i];
+						node = c[i];
 						if(node == this.anchor || node == this.current){ break; }
 						this._addItemClass(node, "Selected");
 						this.selection[node.id] = 1;
@@ -225,7 +227,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 		}else{
 			if(this.singular){
 				if(this.anchor == this.current){
-					if(dojo.isCopyKey(e)){
+					if(dnd.getCopyKeyState(e)){
 						this.selectNone();
 					}
 				}else{
@@ -235,7 +237,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 					this.selection[this.current.id] = 1;
 				}
 			}else{
-				if(dojo.isCopyKey(e)){
+				if(dnd.getCopyKeyState(e)){
 					if(this.anchor == this.current){
 						delete this.selection[this.anchor.id];
 						this._removeAnchor();
@@ -263,9 +265,9 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 				}
 			}
 		}
-		dojo.stopEvent(e);
+		event.stop(e);
 	},
-	onMouseUp: function(e){
+	onMouseUp: function(/*===== e =====*/){
 		// summary:
 		//		event processor for onmouseup
 		// e: Event
@@ -279,7 +281,7 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 			this.selection[this.current.id] = 1;
 		}
 	},
-	onMouseMove: function(e){
+	onMouseMove: function(/*===== e =====*/){
 		// summary:
 		//		event processor for onmousemove
 		// e: Event
@@ -291,21 +293,23 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	onOverEvent: function(){
 		// summary:
 		//		this function is called once, when mouse is over our container
-		this.onmousemoveEvent = dojo.connect(this.node, "onmousemove", this, "onMouseMove");
+		this.onmousemoveEvent = on(this.node, touch.move, lang.hitch(this, "onMouseMove"));
 	},
 	onOutEvent: function(){
 		// summary:
 		//		this function is called once, when mouse is out of our container
-		dojo.disconnect(this.onmousemoveEvent);
-		delete this.onmousemoveEvent;
+		if(this.onmousemoveEvent){
+			this.onmousemoveEvent.remove();
+			delete this.onmousemoveEvent;
+		}
 	},
 	_removeSelection: function(){
 		// summary:
 		//		unselects all items
-		var e = dojo.dnd._empty;
+		var e = dnd._empty;
 		for(var i in this.selection){
 			if(i in e){ continue; }
-			var node = dojo.byId(i);
+			var node = dom.byId(i);
 			if(node){ this._removeItemClass(node, "Selected"); }
 		}
 		this.selection = {};
@@ -320,5 +324,6 @@ dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, {
 	}
 });
 
-return dojo.dnd.Selector;
+return Selector;
+
 });