From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dojo/dnd/Manager.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/dojo/dnd/Manager.js') diff --git a/lib/dojo/dnd/Manager.js b/lib/dojo/dnd/Manager.js index 70754f93f..38611fbd4 100644 --- a/lib/dojo/dnd/Manager.js +++ b/lib/dojo/dnd/Manager.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ @@ -8,11 +8,11 @@ if(!dojo._hasResource["dojo.dnd.Manager"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo.dnd.Manager"] = true; dojo.provide("dojo.dnd.Manager"); - dojo.require("dojo.dnd.common"); dojo.require("dojo.dnd.autoscroll"); dojo.require("dojo.dnd.Avatar"); + dojo.declare("dojo.dnd.Manager", null, { // summary: // the manager of DnD operations (usually a singleton) @@ -84,7 +84,7 @@ dojo.declare("dojo.dnd.Manager", null, { dojo.connect(dojo.body(), "onselectstart", dojo.stopEvent) ]; var c = "dojoDnd" + (copy ? "Copy" : "Move"); - dojo.addClass(dojo.body(), c); + dojo.addClass(dojo.body(), c); }, canDrop: function(flag){ // summary: @@ -98,8 +98,7 @@ dojo.declare("dojo.dnd.Manager", null, { stopDrag: function(){ // summary: // stop the DnD in progress - dojo.removeClass(dojo.body(), "dojoDndCopy"); - dojo.removeClass(dojo.body(), "dojoDndMove"); + dojo.removeClass(dojo.body(), ["dojoDndCopy", "dojoDndMove"]); dojo.forEach(this.events, dojo.disconnect); this.events = []; this.avatar.destroy(); @@ -132,7 +131,7 @@ dojo.declare("dojo.dnd.Manager", null, { s.left = (e.pageX + this.OFFSET_X) + "px"; s.top = (e.pageY + this.OFFSET_Y) + "px"; var copy = Boolean(this.source.copyState(dojo.isCopyKey(e))); - if(this.copy != copy){ + if(this.copy != copy){ this._setCopyStatus(copy); } } @@ -166,7 +165,7 @@ dojo.declare("dojo.dnd.Manager", null, { switch(e.keyCode){ case dojo.keys.CTRL: var copy = Boolean(this.source.copyState(true)); - if(this.copy != copy){ + if(this.copy != copy){ this._setCopyStatus(copy); } break; @@ -184,7 +183,7 @@ dojo.declare("dojo.dnd.Manager", null, { // keyboard event if(this.avatar && e.keyCode == dojo.keys.CTRL){ var copy = Boolean(this.source.copyState(false)); - if(this.copy != copy){ + if(this.copy != copy){ this._setCopyStatus(copy); } } @@ -199,8 +198,9 @@ dojo.declare("dojo.dnd.Manager", null, { this.copy = copy; this.source._markDndStatus(this.copy); this.updateAvatar(); - dojo.removeClass(dojo.body(), "dojoDnd" + (this.copy ? "Move" : "Copy")); - dojo.addClass(dojo.body(), "dojoDnd" + (this.copy ? "Copy" : "Move")); + dojo.replaceClass(dojo.body(), + "dojoDnd" + (this.copy ? "Copy" : "Move"), + "dojoDnd" + (this.copy ? "Move" : "Copy")); } }); -- cgit v1.2.3