diff options
Diffstat (limited to 'lib/dojo/dnd')
-rw-r--r-- | lib/dojo/dnd/Avatar.js | 160 | ||||
-rw-r--r-- | lib/dojo/dnd/Container.js | 644 | ||||
-rw-r--r-- | lib/dojo/dnd/Manager.js | 322 | ||||
-rw-r--r-- | lib/dojo/dnd/Moveable.js | 235 | ||||
-rw-r--r-- | lib/dojo/dnd/Mover.js | 160 | ||||
-rw-r--r-- | lib/dojo/dnd/Selector.js | 553 | ||||
-rw-r--r-- | lib/dojo/dnd/Source.js | 825 | ||||
-rw-r--r-- | lib/dojo/dnd/TimedMoveable.js | 97 | ||||
-rw-r--r-- | lib/dojo/dnd/autoscroll.js | 191 | ||||
-rw-r--r-- | lib/dojo/dnd/common.js | 43 | ||||
-rw-r--r-- | lib/dojo/dnd/move.js | 351 |
11 files changed, 2313 insertions, 1268 deletions
diff --git a/lib/dojo/dnd/Avatar.js b/lib/dojo/dnd/Avatar.js index 057668026..effd253f3 100644 --- a/lib/dojo/dnd/Avatar.js +++ b/lib/dojo/dnd/Avatar.js @@ -5,60 +5,112 @@ */ -if(!dojo._hasResource["dojo.dnd.Avatar"]){ -dojo._hasResource["dojo.dnd.Avatar"]=true; +if(!dojo._hasResource["dojo.dnd.Avatar"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Avatar"] = true; dojo.provide("dojo.dnd.Avatar"); + dojo.require("dojo.dnd.common"); -dojo.declare("dojo.dnd.Avatar",null,{constructor:function(_1){ -this.manager=_1; -this.construct(); -},construct:function(){ -this.isA11y=dojo.hasClass(dojo.body(),"dijit_a11y"); -var a=dojo.create("table",{"class":"dojoDndAvatar",style:{position:"absolute",zIndex:"1999",margin:"0px"}}),_2=this.manager.source,_3,b=dojo.create("tbody",null,a),tr=dojo.create("tr",null,b),td=dojo.create("td",null,tr),_4=this.isA11y?dojo.create("span",{id:"a11yIcon",innerHTML:this.manager.copy?"+":"<"},td):null,_5=dojo.create("span",{innerHTML:_2.generateText?this._generateText():""},td),k=Math.min(5,this.manager.nodes.length),i=0; -dojo.attr(tr,{"class":"dojoDndAvatarHeader",style:{opacity:0.9}}); -for(;i<k;++i){ -if(_2.creator){ -_3=_2._normalizedCreator(_2.getItem(this.manager.nodes[i].id).data,"avatar").node; -}else{ -_3=this.manager.nodes[i].cloneNode(true); -if(_3.tagName.toLowerCase()=="tr"){ -var _6=dojo.create("table"),_7=dojo.create("tbody",null,_6); -_7.appendChild(_3); -_3=_6; -} -} -_3.id=""; -tr=dojo.create("tr",null,b); -td=dojo.create("td",null,tr); -td.appendChild(_3); -dojo.attr(tr,{"class":"dojoDndAvatarItem",style:{opacity:(9-i)/10}}); -} -this.node=a; -},destroy:function(){ -dojo.destroy(this.node); -this.node=false; -},update:function(){ -dojo[(this.manager.canDropFlag?"add":"remove")+"Class"](this.node,"dojoDndAvatarCanDrop"); -if(this.isA11y){ -var _8=dojo.byId("a11yIcon"); -var _9="+"; -if(this.manager.canDropFlag&&!this.manager.copy){ -_9="< "; -}else{ -if(!this.manager.canDropFlag&&!this.manager.copy){ -_9="o"; -}else{ -if(!this.manager.canDropFlag){ -_9="x"; -} -} -} -_8.innerHTML=_9; -} -dojo.query(("tr.dojoDndAvatarHeader td span"+(this.isA11y?" span":"")),this.node).forEach(function(_a){ -_a.innerHTML=this._generateText(); -},this); -},_generateText:function(){ -return this.manager.nodes.length.toString(); -}}); + +dojo.declare("dojo.dnd.Avatar", null, { + // summary: + // Object that represents transferred DnD items visually + // manager: Object + // a DnD manager object + + constructor: function(manager){ + this.manager = manager; + this.construct(); + }, + + // methods + construct: function(){ + // summary: + // constructor function; + // it is separate so it can be (dynamically) overwritten in case of need + this.isA11y = dojo.hasClass(dojo.body(),"dijit_a11y"); + var a = dojo.create("table", { + "class": "dojoDndAvatar", + style: { + position: "absolute", + zIndex: "1999", + margin: "0px" + } + }), + source = this.manager.source, node, + b = dojo.create("tbody", null, a), + tr = dojo.create("tr", null, b), + td = dojo.create("td", null, tr), + icon = this.isA11y ? dojo.create("span", { + id : "a11yIcon", + innerHTML : this.manager.copy ? '+' : "<" + }, td) : null, + span = dojo.create("span", { + innerHTML: source.generateText ? this._generateText() : "" + }, td), + k = Math.min(5, this.manager.nodes.length), i = 0; + // we have to set the opacity on IE only after the node is live + dojo.attr(tr, { + "class": "dojoDndAvatarHeader", + style: {opacity: 0.9} + }); + for(; i < k; ++i){ + if(source.creator){ + // create an avatar representation of the node + node = source._normalizedCreator(source.getItem(this.manager.nodes[i].id).data, "avatar").node; + }else{ + // or just clone the node and hope it works + node = this.manager.nodes[i].cloneNode(true); + if(node.tagName.toLowerCase() == "tr"){ + // insert extra table nodes + var table = dojo.create("table"), + tbody = dojo.create("tbody", null, table); + tbody.appendChild(node); + node = table; + } + } + node.id = ""; + tr = dojo.create("tr", null, b); + td = dojo.create("td", null, tr); + td.appendChild(node); + dojo.attr(tr, { + "class": "dojoDndAvatarItem", + style: {opacity: (9 - i) / 10} + }); + } + this.node = a; + }, + destroy: function(){ + // summary: + // destructor for the avatar; called to remove all references so it can be garbage-collected + dojo.destroy(this.node); + this.node = false; + }, + update: function(){ + // summary: + // updates the avatar to reflect the current DnD state + dojo[(this.manager.canDropFlag ? "add" : "remove") + "Class"](this.node, "dojoDndAvatarCanDrop"); + if (this.isA11y){ + var icon = dojo.byId("a11yIcon"); + var text = '+'; // assume canDrop && copy + if (this.manager.canDropFlag && !this.manager.copy) { + text = '< '; // canDrop && move + }else if (!this.manager.canDropFlag && !this.manager.copy) { + text = "o"; //!canDrop && move + }else if(!this.manager.canDropFlag){ + text = 'x'; // !canDrop && copy + } + icon.innerHTML=text; + } + // replace text + dojo.query(("tr.dojoDndAvatarHeader td span" +(this.isA11y ? " span" : "")), this.node).forEach( + function(node){ + node.innerHTML = this._generateText(); + }, this); + }, + _generateText: function(){ + // summary: generates a proper text to reflect copying or moving of items + return this.manager.nodes.length.toString(); + } +}); + } diff --git a/lib/dojo/dnd/Container.js b/lib/dojo/dnd/Container.js index 01e4ce2d9..6efc6f6fb 100644 --- a/lib/dojo/dnd/Container.js +++ b/lib/dojo/dnd/Container.js @@ -5,231 +5,435 @@ */ -if(!dojo._hasResource["dojo.dnd.Container"]){ -dojo._hasResource["dojo.dnd.Container"]=true; +if(!dojo._hasResource["dojo.dnd.Container"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Container"] = true; dojo.provide("dojo.dnd.Container"); + dojo.require("dojo.dnd.common"); dojo.require("dojo.parser"); -dojo.declare("dojo.dnd.Container",null,{skipForm:false,constructor:function(_1,_2){ -this.node=dojo.byId(_1); -if(!_2){ -_2={}; -} -this.creator=_2.creator||null; -this.skipForm=_2.skipForm; -this.parent=_2.dropParent&&dojo.byId(_2.dropParent); -this.map={}; -this.current=null; -this.containerState=""; -dojo.addClass(this.node,"dojoDndContainer"); -if(!(_2&&_2._skipStartup)){ -this.startup(); -} -this.events=[dojo.connect(this.node,"onmouseover",this,"onMouseOver"),dojo.connect(this.node,"onmouseout",this,"onMouseOut"),dojo.connect(this.node,"ondragstart",this,"onSelectStart"),dojo.connect(this.node,"onselectstart",this,"onSelectStart")]; -},creator:function(){ -},getItem:function(_3){ -return this.map[_3]; -},setItem:function(_4,_5){ -this.map[_4]=_5; -},delItem:function(_6){ -delete this.map[_6]; -},forInItems:function(f,o){ -o=o||dojo.global; -var m=this.map,e=dojo.dnd._empty; -for(var i in m){ -if(i in e){ -continue; -} -f.call(o,m[i],i,this); -} -return o; -},clearItems:function(){ -this.map={}; -},getAllNodes:function(){ -return dojo.query("> .dojoDndItem",this.parent); -},sync:function(){ -var _7={}; -this.getAllNodes().forEach(function(_8){ -if(_8.id){ -var _9=this.getItem(_8.id); -if(_9){ -_7[_8.id]=_9; -return; -} -}else{ -_8.id=dojo.dnd.getUniqueId(); -} -var _a=_8.getAttribute("dndType"),_b=_8.getAttribute("dndData"); -_7[_8.id]={data:_b||_8.innerHTML,type:_a?_a.split(/\s*,\s*/):["text"]}; -},this); -this.map=_7; -return this; -},insertNodes:function(_c,_d,_e){ -if(!this.parent.firstChild){ -_e=null; -}else{ -if(_d){ -if(!_e){ -_e=this.parent.firstChild; -} -}else{ -if(_e){ -_e=_e.nextSibling; -} -} -} -if(_e){ -for(var i=0;i<_c.length;++i){ -var t=this._normalizedCreator(_c[i]); -this.setItem(t.node.id,{data:t.data,type:t.type}); -this.parent.insertBefore(t.node,_e); -} -}else{ -for(var i=0;i<_c.length;++i){ -var t=this._normalizedCreator(_c[i]); -this.setItem(t.node.id,{data:t.data,type:t.type}); -this.parent.appendChild(t.node); -} -} -return this; -},destroy:function(){ -dojo.forEach(this.events,dojo.disconnect); -this.clearItems(); -this.node=this.parent=this.current=null; -},markupFactory:function(_f,_10){ -_f._skipStartup=true; -return new dojo.dnd.Container(_10,_f); -},startup:function(){ -if(!this.parent){ -this.parent=this.node; -if(this.parent.tagName.toLowerCase()=="table"){ -var c=this.parent.getElementsByTagName("tbody"); -if(c&&c.length){ -this.parent=c[0]; -} -} -} -this.defaultCreator=dojo.dnd._defaultCreator(this.parent); -this.sync(); -},onMouseOver:function(e){ -var n=e.relatedTarget; -while(n){ -if(n==this.node){ -break; -} -try{ -n=n.parentNode; -} -catch(x){ -n=null; -} -} -if(!n){ -this._changeState("Container","Over"); -this.onOverEvent(); -} -n=this._getChildByEvent(e); -if(this.current==n){ -return; -} -if(this.current){ -this._removeItemClass(this.current,"Over"); -} -if(n){ -this._addItemClass(n,"Over"); -} -this.current=n; -},onMouseOut:function(e){ -for(var n=e.relatedTarget;n;){ -if(n==this.node){ -return; -} -try{ -n=n.parentNode; -} -catch(x){ -n=null; -} -} -if(this.current){ -this._removeItemClass(this.current,"Over"); -this.current=null; -} -this._changeState("Container",""); -this.onOutEvent(); -},onSelectStart:function(e){ -if(!this.skipForm||!dojo.dnd.isFormElement(e)){ -dojo.stopEvent(e); -} -},onOverEvent:function(){ -},onOutEvent:function(){ -},_changeState:function(_11,_12){ -var _13="dojoDnd"+_11; -var _14=_11.toLowerCase()+"State"; -dojo.removeClass(this.node,_13+this[_14]); -dojo.addClass(this.node,_13+_12); -this[_14]=_12; -},_addItemClass:function(_15,_16){ -dojo.addClass(_15,"dojoDndItem"+_16); -},_removeItemClass:function(_17,_18){ -dojo.removeClass(_17,"dojoDndItem"+_18); -},_getChildByEvent:function(e){ -var _19=e.target; -if(_19){ -for(var _1a=_19.parentNode;_1a;_19=_1a,_1a=_19.parentNode){ -if(_1a==this.parent&&dojo.hasClass(_19,"dojoDndItem")){ -return _19; -} -} -} -return null; -},_normalizedCreator:function(_1b,_1c){ -var t=(this.creator||this.defaultCreator).call(this,_1b,_1c); -if(!dojo.isArray(t.type)){ -t.type=["text"]; -} -if(!t.node.id){ -t.node.id=dojo.dnd.getUniqueId(); -} -dojo.addClass(t.node,"dojoDndItem"); -return t; -}}); -dojo.dnd._createNode=function(tag){ -if(!tag){ -return dojo.dnd._createSpan; -} -return function(_1d){ -return dojo.create(tag,{innerHTML:_1d}); -}; -}; -dojo.dnd._createTrTd=function(_1e){ -var tr=dojo.create("tr"); -dojo.create("td",{innerHTML:_1e},tr); -return tr; + +/* + Container states: + "" - normal state + "Over" - mouse over a container + Container item states: + "" - normal state + "Over" - mouse over a container item +*/ + +/*===== +dojo.declare("dojo.dnd.__ContainerArgs", [], { + creator: function(){ + // summary: + // a creator function, which takes a data item, and returns an object like that: + // {node: newNode, data: usedData, type: arrayOfStrings} + }, + + // skipForm: Boolean + // don't start the drag operation, if clicked on form elements + skipForm: false, + + // dropParent: Node||String + // node or node's id to use as the parent node for dropped items + // (must be underneath the 'node' parameter in the DOM) + dropParent: null, + + // _skipStartup: Boolean + // skip startup(), which collects children, for deferred initialization + // (this is used in the markup mode) + _skipStartup: false +}); + +dojo.dnd.Item = function(){ + // summary: + // Represents (one of) the source node(s) being dragged. + // Contains (at least) the "type" and "data" attributes. + // type: String[] + // Type(s) of this item, by default this is ["text"] + // data: Object + // Logical representation of the object being dragged. + // If the drag object's type is "text" then data is a String, + // if it's another type then data could be a different Object, + // perhaps a name/value hash. + + this.type = type; + this.data = data; +} +=====*/ + +dojo.declare("dojo.dnd.Container", null, { + // summary: + // a Container object, which knows when mouse hovers over it, + // and over which element it hovers + + // object attributes (for markup) + skipForm: false, + + /*===== + // current: DomNode + // The DOM node the mouse is currently hovered over + current: null, + + // map: Hash<String, dojo.dnd.Item> + // Map from an item's id (which is also the DOMNode's id) to + // the dojo.dnd.Item itself. + map: {}, + =====*/ + + constructor: function(node, params){ + // summary: + // a constructor of the Container + // node: Node + // node or node's id to build the container on + // params: dojo.dnd.__ContainerArgs + // a dictionary of parameters + this.node = dojo.byId(node); + if(!params){ params = {}; } + this.creator = params.creator || null; + this.skipForm = params.skipForm; + this.parent = params.dropParent && dojo.byId(params.dropParent); + + // class-specific variables + this.map = {}; + this.current = null; + + // states + this.containerState = ""; + dojo.addClass(this.node, "dojoDndContainer"); + + // mark up children + if(!(params && params._skipStartup)){ + this.startup(); + } + + // set up events + this.events = [ + dojo.connect(this.node, "onmouseover", this, "onMouseOver"), + dojo.connect(this.node, "onmouseout", this, "onMouseOut"), + // cancel text selection and text dragging + dojo.connect(this.node, "ondragstart", this, "onSelectStart"), + dojo.connect(this.node, "onselectstart", this, "onSelectStart") + ]; + }, + + // object attributes (for markup) + creator: function(){ + // summary: + // creator function, dummy at the moment + }, + + // abstract access to the map + getItem: function(/*String*/ key){ + // summary: + // returns a data item by its key (id) + return this.map[key]; // dojo.dnd.Item + }, + setItem: function(/*String*/ key, /*dojo.dnd.Item*/ data){ + // summary: + // associates a data item with its key (id) + this.map[key] = data; + }, + delItem: function(/*String*/ key){ + // summary: + // removes a data item from the map by its key (id) + delete this.map[key]; + }, + forInItems: function(/*Function*/ f, /*Object?*/ o){ + // summary: + // iterates over a data map skipping members that + // are present in the empty object (IE and/or 3rd-party libraries). + o = o || dojo.global; + var m = this.map, e = dojo.dnd._empty; + for(var i in m){ + if(i in e){ continue; } + f.call(o, m[i], i, this); + } + return o; // Object + }, + clearItems: function(){ + // summary: + // removes all data items from the map + this.map = {}; + }, + + // methods + getAllNodes: function(){ + // summary: + // returns a list (an array) of all valid child nodes + return dojo.query("> .dojoDndItem", this.parent); // NodeList + }, + sync: function(){ + // summary: + // sync up the node list with the data map + var map = {}; + this.getAllNodes().forEach(function(node){ + if(node.id){ + var item = this.getItem(node.id); + if(item){ + map[node.id] = item; + return; + } + }else{ + node.id = dojo.dnd.getUniqueId(); + } + var type = node.getAttribute("dndType"), + data = node.getAttribute("dndData"); + map[node.id] = { + data: data || node.innerHTML, + type: type ? type.split(/\s*,\s*/) : ["text"] + }; + }, this); + this.map = map; + return this; // self + }, + insertNodes: function(data, before, anchor){ + // summary: + // inserts an array of new nodes before/after an anchor node + // data: Array + // a list of data items, which should be processed by the creator function + // before: Boolean + // insert before the anchor, if true, and after the anchor otherwise + // anchor: Node + // the anchor node to be used as a point of insertion + if(!this.parent.firstChild){ + anchor = null; + }else if(before){ + if(!anchor){ + anchor = this.parent.firstChild; + } + }else{ + if(anchor){ + anchor = anchor.nextSibling; + } + } + if(anchor){ + for(var i = 0; i < data.length; ++i){ + var t = this._normalizedCreator(data[i]); + this.setItem(t.node.id, {data: t.data, type: t.type}); + this.parent.insertBefore(t.node, anchor); + } + }else{ + for(var i = 0; i < data.length; ++i){ + var t = this._normalizedCreator(data[i]); + this.setItem(t.node.id, {data: t.data, type: t.type}); + this.parent.appendChild(t.node); + } + } + return this; // self + }, + destroy: function(){ + // summary: + // prepares this object to be garbage-collected + dojo.forEach(this.events, dojo.disconnect); + this.clearItems(); + this.node = this.parent = this.current = null; + }, + + // markup methods + markupFactory: function(params, node){ + params._skipStartup = true; + return new dojo.dnd.Container(node, params); + }, + startup: function(){ + // summary: + // collects valid child items and populate the map + + // set up the real parent node + if(!this.parent){ + // use the standard algorithm, if not assigned + this.parent = this.node; + if(this.parent.tagName.toLowerCase() == "table"){ + var c = this.parent.getElementsByTagName("tbody"); + if(c && c.length){ this.parent = c[0]; } + } + } + this.defaultCreator = dojo.dnd._defaultCreator(this.parent); + + // process specially marked children + this.sync(); + }, + + // mouse events + onMouseOver: function(e){ + // summary: + // event processor for onmouseover + // e: Event + // mouse event + var n = e.relatedTarget; + while(n){ + if(n == this.node){ break; } + try{ + n = n.parentNode; + }catch(x){ + n = null; + } + } + if(!n){ + this._changeState("Container", "Over"); + this.onOverEvent(); + } + n = this._getChildByEvent(e); + if(this.current == n){ return; } + if(this.current){ this._removeItemClass(this.current, "Over"); } + if(n){ this._addItemClass(n, "Over"); } + this.current = n; + }, + onMouseOut: function(e){ + // summary: + // event processor for onmouseout + // e: Event + // mouse event + for(var n = e.relatedTarget; n;){ + if(n == this.node){ return; } + try{ + n = n.parentNode; + }catch(x){ + n = null; + } + } + if(this.current){ + this._removeItemClass(this.current, "Over"); + this.current = null; + } + this._changeState("Container", ""); + this.onOutEvent(); + }, + onSelectStart: function(e){ + // summary: + // event processor for onselectevent and ondragevent + // e: Event + // mouse event + if(!this.skipForm || !dojo.dnd.isFormElement(e)){ + dojo.stopEvent(e); + } + }, + + // utilities + onOverEvent: function(){ + // summary: + // this function is called once, when mouse is over our container + }, + onOutEvent: function(){ + // summary: + // this function is called once, when mouse is out of our container + }, + _changeState: function(type, newState){ + // summary: + // changes a named state to new state value + // type: String + // a name of the state to change + // newState: String + // new state + var prefix = "dojoDnd" + type; + var state = type.toLowerCase() + "State"; + //dojo.replaceClass(this.node, prefix + newState, prefix + this[state]); + dojo.removeClass(this.node, prefix + this[state]); + dojo.addClass(this.node, prefix + newState); + this[state] = newState; + }, + _addItemClass: function(node, type){ + // summary: + // adds a class with prefix "dojoDndItem" + // node: Node + // a node + // type: String + // a variable suffix for a class name + dojo.addClass(node, "dojoDndItem" + type); + }, + _removeItemClass: function(node, type){ + // summary: + // removes a class with prefix "dojoDndItem" + // node: Node + // a node + // type: String + // a variable suffix for a class name + dojo.removeClass(node, "dojoDndItem" + type); + }, + _getChildByEvent: function(e){ + // summary: + // gets a child, which is under the mouse at the moment, or null + // e: Event + // a mouse event + var node = e.target; + if(node){ + for(var parent = node.parentNode; parent; node = parent, parent = node.parentNode){ + if(parent == this.parent && dojo.hasClass(node, "dojoDndItem")){ return node; } + } + } + return null; + }, + _normalizedCreator: function(/*dojo.dnd.Item*/ item, /*String*/ hint){ + // summary: + // adds all necessary data to the output of the user-supplied creator function + var t = (this.creator || this.defaultCreator).call(this, item, hint); + if(!dojo.isArray(t.type)){ t.type = ["text"]; } + if(!t.node.id){ t.node.id = dojo.dnd.getUniqueId(); } + dojo.addClass(t.node, "dojoDndItem"); + return t; + } +}); + +dojo.dnd._createNode = function(tag){ + // summary: + // returns a function, which creates an element of given tag + // (SPAN by default) and sets its innerHTML to given text + // tag: String + // a tag name or empty for SPAN + if(!tag){ return dojo.dnd._createSpan; } + return function(text){ // Function + return dojo.create(tag, {innerHTML: text}); // Node + }; }; -dojo.dnd._createSpan=function(_1f){ -return dojo.create("span",{innerHTML:_1f}); + +dojo.dnd._createTrTd = function(text){ + // summary: + // creates a TR/TD structure with given text as an innerHTML of TD + // text: String + // a text for TD + var tr = dojo.create("tr"); + dojo.create("td", {innerHTML: text}, tr); + return tr; // Node }; -dojo.dnd._defaultCreatorNodes={ul:"li",ol:"li",div:"div",p:"div"}; -dojo.dnd._defaultCreator=function(_20){ -var tag=_20.tagName.toLowerCase(); -var c=tag=="tbody"||tag=="thead"?dojo.dnd._createTrTd:dojo.dnd._createNode(dojo.dnd._defaultCreatorNodes[tag]); -return function(_21,_22){ -var _23=_21&&dojo.isObject(_21),_24,_25,n; -if(_23&&_21.tagName&&_21.nodeType&&_21.getAttribute){ -_24=_21.getAttribute("dndData")||_21.innerHTML; -_25=_21.getAttribute("dndType"); -_25=_25?_25.split(/\s*,\s*/):["text"]; -n=_21; -}else{ -_24=(_23&&_21.data)?_21.data:_21; -_25=(_23&&_21.type)?_21.type:["text"]; -n=(_22=="avatar"?dojo.dnd._createSpan:c)(String(_24)); -} -if(!n.id){ -n.id=dojo.dnd.getUniqueId(); -} -return {node:n,data:_24,type:_25}; + +dojo.dnd._createSpan = function(text){ + // summary: + // creates a SPAN element with given text as its innerHTML + // text: String + // a text for SPAN + return dojo.create("span", {innerHTML: text}); // Node }; + +// dojo.dnd._defaultCreatorNodes: Object +// a dictionary that maps container tag names to child tag names +dojo.dnd._defaultCreatorNodes = {ul: "li", ol: "li", div: "div", p: "div"}; + +dojo.dnd._defaultCreator = function(node){ + // summary: + // takes a parent node, and returns an appropriate creator function + // node: Node + // a container node + var tag = node.tagName.toLowerCase(); + var c = tag == "tbody" || tag == "thead" ? dojo.dnd._createTrTd : + dojo.dnd._createNode(dojo.dnd._defaultCreatorNodes[tag]); + return function(item, hint){ // Function + var isObj = item && dojo.isObject(item), data, type, n; + if(isObj && item.tagName && item.nodeType && item.getAttribute){ + // process a DOM node + data = item.getAttribute("dndData") || item.innerHTML; + type = item.getAttribute("dndType"); + type = type ? type.split(/\s*,\s*/) : ["text"]; + n = item; // this node is going to be moved rather than copied + }else{ + // process a DnD item object or a string + data = (isObj && item.data) ? item.data : item; + type = (isObj && item.type) ? item.type : ["text"]; + n = (hint == "avatar" ? dojo.dnd._createSpan : c)(String(data)); + } + if(!n.id){ + n.id = dojo.dnd.getUniqueId(); + } + return {node: n, data: data, type: type}; + }; }; + } diff --git a/lib/dojo/dnd/Manager.js b/lib/dojo/dnd/Manager.js index c6f91aac3..70754f93f 100644 --- a/lib/dojo/dnd/Manager.js +++ b/lib/dojo/dnd/Manager.js @@ -5,124 +5,216 @@ */ -if(!dojo._hasResource["dojo.dnd.Manager"]){ -dojo._hasResource["dojo.dnd.Manager"]=true; +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,{constructor:function(){ -this.avatar=null; -this.source=null; -this.nodes=[]; -this.copy=true; -this.target=null; -this.canDropFlag=false; -this.events=[]; -},OFFSET_X:16,OFFSET_Y:16,overSource:function(_1){ -if(this.avatar){ -this.target=(_1&&_1.targetState!="Disabled")?_1:null; -this.canDropFlag=Boolean(this.target); -this.avatar.update(); -} -dojo.publish("/dnd/source/over",[_1]); -},outSource:function(_2){ -if(this.avatar){ -if(this.target==_2){ -this.target=null; -this.canDropFlag=false; -this.avatar.update(); -dojo.publish("/dnd/source/over",[null]); -} -}else{ -dojo.publish("/dnd/source/over",[null]); -} -},startDrag:function(_3,_4,_5){ -this.source=_3; -this.nodes=_4; -this.copy=Boolean(_5); -this.avatar=this.makeAvatar(); -dojo.body().appendChild(this.avatar.node); -dojo.publish("/dnd/start",[_3,_4,this.copy]); -this.events=[dojo.connect(dojo.doc,"onmousemove",this,"onMouseMove"),dojo.connect(dojo.doc,"onmouseup",this,"onMouseUp"),dojo.connect(dojo.doc,"onkeydown",this,"onKeyDown"),dojo.connect(dojo.doc,"onkeyup",this,"onKeyUp"),dojo.connect(dojo.doc,"ondragstart",dojo.stopEvent),dojo.connect(dojo.body(),"onselectstart",dojo.stopEvent)]; -var c="dojoDnd"+(_5?"Copy":"Move"); -dojo.addClass(dojo.body(),c); -},canDrop:function(_6){ -var _7=Boolean(this.target&&_6); -if(this.canDropFlag!=_7){ -this.canDropFlag=_7; -this.avatar.update(); -} -},stopDrag:function(){ -dojo.removeClass(dojo.body(),"dojoDndCopy"); -dojo.removeClass(dojo.body(),"dojoDndMove"); -dojo.forEach(this.events,dojo.disconnect); -this.events=[]; -this.avatar.destroy(); -this.avatar=null; -this.source=this.target=null; -this.nodes=[]; -},makeAvatar:function(){ -return new dojo.dnd.Avatar(this); -},updateAvatar:function(){ -this.avatar.update(); -},onMouseMove:function(e){ -var a=this.avatar; -if(a){ -dojo.dnd.autoScrollNodes(e); -var s=a.node.style; -s.left=(e.pageX+this.OFFSET_X)+"px"; -s.top=(e.pageY+this.OFFSET_Y)+"px"; -var _8=Boolean(this.source.copyState(dojo.isCopyKey(e))); -if(this.copy!=_8){ -this._setCopyStatus(_8); -} -} -},onMouseUp:function(e){ -if(this.avatar){ -if(this.target&&this.canDropFlag){ -var _9=Boolean(this.source.copyState(dojo.isCopyKey(e))),_a=[this.source,this.nodes,_9,this.target,e]; -dojo.publish("/dnd/drop/before",_a); -dojo.publish("/dnd/drop",_a); -}else{ -dojo.publish("/dnd/cancel"); -} -this.stopDrag(); -} -},onKeyDown:function(e){ -if(this.avatar){ -switch(e.keyCode){ -case dojo.keys.CTRL: -var _b=Boolean(this.source.copyState(true)); -if(this.copy!=_b){ -this._setCopyStatus(_b); -} -break; -case dojo.keys.ESCAPE: -dojo.publish("/dnd/cancel"); -this.stopDrag(); -break; -} -} -},onKeyUp:function(e){ -if(this.avatar&&e.keyCode==dojo.keys.CTRL){ -var _c=Boolean(this.source.copyState(false)); -if(this.copy!=_c){ -this._setCopyStatus(_c); -} -} -},_setCopyStatus:function(_d){ -this.copy=_d; -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.dnd._manager=null; -dojo.dnd.manager=function(){ -if(!dojo.dnd._manager){ -dojo.dnd._manager=new dojo.dnd.Manager(); -} -return dojo.dnd._manager; + +dojo.declare("dojo.dnd.Manager", null, { + // summary: + // the manager of DnD operations (usually a singleton) + constructor: function(){ + this.avatar = null; + this.source = null; + this.nodes = []; + this.copy = true; + this.target = null; + this.canDropFlag = false; + this.events = []; + }, + + // avatar's offset from the mouse + OFFSET_X: 16, + OFFSET_Y: 16, + + // methods + overSource: function(source){ + // summary: + // called when a source detected a mouse-over condition + // source: Object + // the reporter + if(this.avatar){ + this.target = (source && source.targetState != "Disabled") ? source : null; + this.canDropFlag = Boolean(this.target); + this.avatar.update(); + } + dojo.publish("/dnd/source/over", [source]); + }, + outSource: function(source){ + // summary: + // called when a source detected a mouse-out condition + // source: Object + // the reporter + if(this.avatar){ + if(this.target == source){ + this.target = null; + this.canDropFlag = false; + this.avatar.update(); + dojo.publish("/dnd/source/over", [null]); + } + }else{ + dojo.publish("/dnd/source/over", [null]); + } + }, + startDrag: function(source, nodes, copy){ + // summary: + // called to initiate the DnD operation + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + this.source = source; + this.nodes = nodes; + this.copy = Boolean(copy); // normalizing to true boolean + this.avatar = this.makeAvatar(); + dojo.body().appendChild(this.avatar.node); + dojo.publish("/dnd/start", [source, nodes, this.copy]); + this.events = [ + dojo.connect(dojo.doc, "onmousemove", this, "onMouseMove"), + dojo.connect(dojo.doc, "onmouseup", this, "onMouseUp"), + dojo.connect(dojo.doc, "onkeydown", this, "onKeyDown"), + dojo.connect(dojo.doc, "onkeyup", this, "onKeyUp"), + // cancel text selection and text dragging + dojo.connect(dojo.doc, "ondragstart", dojo.stopEvent), + dojo.connect(dojo.body(), "onselectstart", dojo.stopEvent) + ]; + var c = "dojoDnd" + (copy ? "Copy" : "Move"); + dojo.addClass(dojo.body(), c); + }, + canDrop: function(flag){ + // summary: + // called to notify if the current target can accept items + var canDropFlag = Boolean(this.target && flag); + if(this.canDropFlag != canDropFlag){ + this.canDropFlag = canDropFlag; + this.avatar.update(); + } + }, + stopDrag: function(){ + // summary: + // stop the DnD in progress + dojo.removeClass(dojo.body(), "dojoDndCopy"); + dojo.removeClass(dojo.body(), "dojoDndMove"); + dojo.forEach(this.events, dojo.disconnect); + this.events = []; + this.avatar.destroy(); + this.avatar = null; + this.source = this.target = null; + this.nodes = []; + }, + makeAvatar: function(){ + // summary: + // makes the avatar; it is separate to be overwritten dynamically, if needed + return new dojo.dnd.Avatar(this); + }, + updateAvatar: function(){ + // summary: + // updates the avatar; it is separate to be overwritten dynamically, if needed + this.avatar.update(); + }, + + // mouse event processors + onMouseMove: function(e){ + // summary: + // event processor for onmousemove + // e: Event + // mouse event + var a = this.avatar; + if(a){ + dojo.dnd.autoScrollNodes(e); + //dojo.dnd.autoScroll(e); + var s = a.node.style; + 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){ + this._setCopyStatus(copy); + } + } + }, + onMouseUp: function(e){ + // summary: + // event processor for onmouseup + // e: Event + // mouse event + if(this.avatar){ + if(this.target && this.canDropFlag){ + var copy = Boolean(this.source.copyState(dojo.isCopyKey(e))), + params = [this.source, this.nodes, copy, this.target, e]; + dojo.publish("/dnd/drop/before", params); + dojo.publish("/dnd/drop", params); + }else{ + dojo.publish("/dnd/cancel"); + } + this.stopDrag(); + } + }, + + // keyboard event processors + onKeyDown: function(e){ + // summary: + // event processor for onkeydown: + // watching for CTRL for copy/move status, watching for ESCAPE to cancel the drag + // e: Event + // keyboard event + if(this.avatar){ + switch(e.keyCode){ + case dojo.keys.CTRL: + var copy = Boolean(this.source.copyState(true)); + if(this.copy != copy){ + this._setCopyStatus(copy); + } + break; + case dojo.keys.ESCAPE: + dojo.publish("/dnd/cancel"); + this.stopDrag(); + break; + } + } + }, + onKeyUp: function(e){ + // summary: + // event processor for onkeyup, watching for CTRL for copy/move status + // e: Event + // keyboard event + if(this.avatar && e.keyCode == dojo.keys.CTRL){ + var copy = Boolean(this.source.copyState(false)); + if(this.copy != copy){ + this._setCopyStatus(copy); + } + } + }, + + // utilities + _setCopyStatus: function(copy){ + // summary: + // changes the copy status + // copy: Boolean + // the copy status + 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.dnd._manager: +// The manager singleton variable. Can be overwritten if needed. +dojo.dnd._manager = null; + +dojo.dnd.manager = function(){ + // summary: + // Returns the current DnD manager. Creates one if it is not created yet. + if(!dojo.dnd._manager){ + dojo.dnd._manager = new dojo.dnd.Manager(); + } + return dojo.dnd._manager; // Object }; + } diff --git a/lib/dojo/dnd/Moveable.js b/lib/dojo/dnd/Moveable.js index 17d8d9200..324196582 100644 --- a/lib/dojo/dnd/Moveable.js +++ b/lib/dojo/dnd/Moveable.js @@ -5,73 +5,174 @@ */ -if(!dojo._hasResource["dojo.dnd.Moveable"]){ -dojo._hasResource["dojo.dnd.Moveable"]=true; +if(!dojo._hasResource["dojo.dnd.Moveable"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Moveable"] = true; dojo.provide("dojo.dnd.Moveable"); + dojo.require("dojo.dnd.Mover"); -dojo.declare("dojo.dnd.Moveable",null,{handle:"",delay:0,skip:false,constructor:function(_1,_2){ -this.node=dojo.byId(_1); -if(!_2){ -_2={}; -} -this.handle=_2.handle?dojo.byId(_2.handle):null; -if(!this.handle){ -this.handle=this.node; -} -this.delay=_2.delay>0?_2.delay:0; -this.skip=_2.skip; -this.mover=_2.mover?_2.mover:dojo.dnd.Mover; -this.events=[dojo.connect(this.handle,"onmousedown",this,"onMouseDown"),dojo.connect(this.handle,"ondragstart",this,"onSelectStart"),dojo.connect(this.handle,"onselectstart",this,"onSelectStart")]; -},markupFactory:function(_3,_4){ -return new dojo.dnd.Moveable(_4,_3); -},destroy:function(){ -dojo.forEach(this.events,dojo.disconnect); -this.events=this.node=this.handle=null; -},onMouseDown:function(e){ -if(this.skip&&dojo.dnd.isFormElement(e)){ -return; -} -if(this.delay){ -this.events.push(dojo.connect(this.handle,"onmousemove",this,"onMouseMove"),dojo.connect(this.handle,"onmouseup",this,"onMouseUp")); -this._lastX=e.pageX; -this._lastY=e.pageY; -}else{ -this.onDragDetected(e); -} -dojo.stopEvent(e); -},onMouseMove:function(e){ -if(Math.abs(e.pageX-this._lastX)>this.delay||Math.abs(e.pageY-this._lastY)>this.delay){ -this.onMouseUp(e); -this.onDragDetected(e); -} -dojo.stopEvent(e); -},onMouseUp:function(e){ -for(var i=0;i<2;++i){ -dojo.disconnect(this.events.pop()); -} -dojo.stopEvent(e); -},onSelectStart:function(e){ -if(!this.skip||!dojo.dnd.isFormElement(e)){ -dojo.stopEvent(e); -} -},onDragDetected:function(e){ -new this.mover(this.node,e,this); -},onMoveStart:function(_5){ -dojo.publish("/dnd/move/start",[_5]); -dojo.addClass(dojo.body(),"dojoMove"); -dojo.addClass(this.node,"dojoMoveItem"); -},onMoveStop:function(_6){ -dojo.publish("/dnd/move/stop",[_6]); -dojo.removeClass(dojo.body(),"dojoMove"); -dojo.removeClass(this.node,"dojoMoveItem"); -},onFirstMove:function(_7,e){ -},onMove:function(_8,_9,e){ -this.onMoving(_8,_9); -var s=_8.node.style; -s.left=_9.l+"px"; -s.top=_9.t+"px"; -this.onMoved(_8,_9); -},onMoving:function(_a,_b){ -},onMoved:function(_c,_d){ -}}); + +/*===== +dojo.declare("dojo.dnd.__MoveableArgs", [], { + // handle: Node||String + // A node (or node's id), which is used as a mouse handle. + // If omitted, the node itself is used as a handle. + handle: null, + + // delay: Number + // delay move by this number of pixels + delay: 0, + + // skip: Boolean + // skip move of form elements + skip: false, + + // mover: Object + // a constructor of custom Mover + mover: dojo.dnd.Mover +}); +=====*/ + +dojo.declare("dojo.dnd.Moveable", null, { + // object attributes (for markup) + handle: "", + delay: 0, + skip: false, + + constructor: function(node, params){ + // summary: + // an object, which makes a node moveable + // node: Node + // a node (or node's id) to be moved + // params: dojo.dnd.__MoveableArgs? + // optional parameters + this.node = dojo.byId(node); + if(!params){ params = {}; } + this.handle = params.handle ? dojo.byId(params.handle) : null; + if(!this.handle){ this.handle = this.node; } + this.delay = params.delay > 0 ? params.delay : 0; + this.skip = params.skip; + this.mover = params.mover ? params.mover : dojo.dnd.Mover; + this.events = [ + dojo.connect(this.handle, "onmousedown", this, "onMouseDown"), + // cancel text selection and text dragging + dojo.connect(this.handle, "ondragstart", this, "onSelectStart"), + dojo.connect(this.handle, "onselectstart", this, "onSelectStart") + ]; + }, + + // markup methods + markupFactory: function(params, node){ + return new dojo.dnd.Moveable(node, params); + }, + + // methods + destroy: function(){ + // summary: + // stops watching for possible move, deletes all references, so the object can be garbage-collected + dojo.forEach(this.events, dojo.disconnect); + this.events = this.node = this.handle = null; + }, + + // mouse event processors + onMouseDown: function(e){ + // summary: + // event processor for onmousedown, creates a Mover for the node + // e: Event + // mouse event + if(this.skip && dojo.dnd.isFormElement(e)){ return; } + if(this.delay){ + this.events.push( + dojo.connect(this.handle, "onmousemove", this, "onMouseMove"), + dojo.connect(this.handle, "onmouseup", this, "onMouseUp") + ); + this._lastX = e.pageX; + this._lastY = e.pageY; + }else{ + this.onDragDetected(e); + } + dojo.stopEvent(e); + }, + onMouseMove: function(e){ + // summary: + // event processor for onmousemove, used only for delayed drags + // e: Event + // mouse event + if(Math.abs(e.pageX - this._lastX) > this.delay || Math.abs(e.pageY - this._lastY) > this.delay){ + this.onMouseUp(e); + this.onDragDetected(e); + } + dojo.stopEvent(e); + }, + onMouseUp: function(e){ + // summary: + // event processor for onmouseup, used only for delayed drags + // e: Event + // mouse event + for(var i = 0; i < 2; ++i){ + dojo.disconnect(this.events.pop()); + } + dojo.stopEvent(e); + }, + onSelectStart: function(e){ + // summary: + // event processor for onselectevent and ondragevent + // e: Event + // mouse event + if(!this.skip || !dojo.dnd.isFormElement(e)){ + dojo.stopEvent(e); + } + }, + + // local events + onDragDetected: function(/* Event */ e){ + // summary: + // called when the drag is detected; + // responsible for creation of the mover + new this.mover(this.node, e, this); + }, + onMoveStart: function(/* dojo.dnd.Mover */ mover){ + // summary: + // called before every move operation + dojo.publish("/dnd/move/start", [mover]); + dojo.addClass(dojo.body(), "dojoMove"); + dojo.addClass(this.node, "dojoMoveItem"); + }, + onMoveStop: function(/* dojo.dnd.Mover */ mover){ + // summary: + // called after every move operation + dojo.publish("/dnd/move/stop", [mover]); + dojo.removeClass(dojo.body(), "dojoMove"); + dojo.removeClass(this.node, "dojoMoveItem"); + }, + onFirstMove: function(/* dojo.dnd.Mover */ mover, /* Event */ e){ + // summary: + // called during the very first move notification; + // can be used to initialize coordinates, can be overwritten. + + // default implementation does nothing + }, + onMove: function(/* dojo.dnd.Mover */ mover, /* Object */ leftTop, /* Event */ e){ + // summary: + // called during every move notification; + // should actually move the node; can be overwritten. + this.onMoving(mover, leftTop); + var s = mover.node.style; + s.left = leftTop.l + "px"; + s.top = leftTop.t + "px"; + this.onMoved(mover, leftTop); + }, + onMoving: function(/* dojo.dnd.Mover */ mover, /* Object */ leftTop){ + // summary: + // called before every incremental move; can be overwritten. + + // default implementation does nothing + }, + onMoved: function(/* dojo.dnd.Mover */ mover, /* Object */ leftTop){ + // summary: + // called after every incremental move; can be overwritten. + + // default implementation does nothing + } +}); + } diff --git a/lib/dojo/dnd/Mover.js b/lib/dojo/dnd/Mover.js index 6ea793efc..cdb995c08 100644 --- a/lib/dojo/dnd/Mover.js +++ b/lib/dojo/dnd/Mover.js @@ -5,61 +5,113 @@ */ -if(!dojo._hasResource["dojo.dnd.Mover"]){ -dojo._hasResource["dojo.dnd.Mover"]=true; +if(!dojo._hasResource["dojo.dnd.Mover"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Mover"] = true; dojo.provide("dojo.dnd.Mover"); + dojo.require("dojo.dnd.common"); dojo.require("dojo.dnd.autoscroll"); -dojo.declare("dojo.dnd.Mover",null,{constructor:function(_1,e,_2){ -this.node=dojo.byId(_1); -this.marginBox={l:e.pageX,t:e.pageY}; -this.mouseButton=e.button; -var h=this.host=_2,d=_1.ownerDocument,_3=dojo.connect(d,"onmousemove",this,"onFirstMove"); -this.events=[dojo.connect(d,"onmousemove",this,"onMouseMove"),dojo.connect(d,"onmouseup",this,"onMouseUp"),dojo.connect(d,"ondragstart",dojo.stopEvent),dojo.connect(d.body,"onselectstart",dojo.stopEvent),_3]; -if(h&&h.onMoveStart){ -h.onMoveStart(this); -} -},onMouseMove:function(e){ -dojo.dnd.autoScroll(e); -var m=this.marginBox; -this.host.onMove(this,{l:m.l+e.pageX,t:m.t+e.pageY},e); -dojo.stopEvent(e); -},onMouseUp:function(e){ -if(dojo.isWebKit&&dojo.isMac&&this.mouseButton==2?e.button==0:this.mouseButton==e.button){ -this.destroy(); -} -dojo.stopEvent(e); -},onFirstMove:function(e){ -var s=this.node.style,l,t,h=this.host; -switch(s.position){ -case "relative": -case "absolute": -l=Math.round(parseFloat(s.left))||0; -t=Math.round(parseFloat(s.top))||0; -break; -default: -s.position="absolute"; -var m=dojo.marginBox(this.node); -var b=dojo.doc.body; -var bs=dojo.getComputedStyle(b); -var bm=dojo._getMarginBox(b,bs); -var bc=dojo._getContentBox(b,bs); -l=m.l-(bc.l-bm.l); -t=m.t-(bc.t-bm.t); -break; -} -this.marginBox.l=l-this.marginBox.l; -this.marginBox.t=t-this.marginBox.t; -if(h&&h.onFirstMove){ -h.onFirstMove(this,e); -} -dojo.disconnect(this.events.pop()); -},destroy:function(){ -dojo.forEach(this.events,dojo.disconnect); -var h=this.host; -if(h&&h.onMoveStop){ -h.onMoveStop(this); -} -this.events=this.node=this.host=null; -}}); + +dojo.declare("dojo.dnd.Mover", null, { + constructor: function(node, e, host){ + // summary: + // an object, which makes a node follow the mouse. + // 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 + // a mouse event, which started the move; + // only pageX and pageY properties are used + // host: Object? + // object which implements the functionality of the move, + // and defines proper events (onMoveStart and onMoveStop) + this.node = dojo.byId(node); + this.marginBox = {l: e.pageX, t: e.pageY}; + this.mouseButton = e.button; + var h = this.host = host, d = node.ownerDocument, + firstEvent = dojo.connect(d, "onmousemove", this, "onFirstMove"); + this.events = [ + dojo.connect(d, "onmousemove", this, "onMouseMove"), + dojo.connect(d, "onmouseup", this, "onMouseUp"), + // cancel text selection and text dragging + dojo.connect(d, "ondragstart", dojo.stopEvent), + dojo.connect(d.body, "onselectstart", dojo.stopEvent), + firstEvent + ]; + // notify that the move has started + if(h && h.onMoveStart){ + h.onMoveStart(this); + } + }, + // mouse event processors + onMouseMove: function(e){ + // summary: + // event processor for onmousemove + // e: Event + // mouse event + dojo.dnd.autoScroll(e); + var m = this.marginBox; + this.host.onMove(this, {l: m.l + e.pageX, t: m.t + e.pageY}, e); + dojo.stopEvent(e); + }, + onMouseUp: function(e){ + if(dojo.isWebKit && dojo.isMac && this.mouseButton == 2 ? + e.button == 0 : this.mouseButton == e.button){ + this.destroy(); + } + dojo.stopEvent(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 + var s = this.node.style, l, t, h = this.host; + switch(s.position){ + case "relative": + case "absolute": + // assume that left and top values are in pixels already + l = Math.round(parseFloat(s.left)) || 0; + t = Math.round(parseFloat(s.top)) || 0; + break; + default: + s.position = "absolute"; // enforcing the absolute mode + var m = dojo.marginBox(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 + // 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); + l = m.l - (bc.l - bm.l); + t = m.t - (bc.t - bm.t); + break; + } + this.marginBox.l = l - this.marginBox.l; + this.marginBox.t = t - this.marginBox.t; + if(h && h.onFirstMove){ + h.onFirstMove(this, e); + } + dojo.disconnect(this.events.pop()); + }, + destroy: function(){ + // summary: + // stops the move, deletes all references, so the object can be garbage-collected + dojo.forEach(this.events, dojo.disconnect); + // undo global settings + var h = this.host; + if(h && h.onMoveStop){ + h.onMoveStop(this); + } + // destroy objects + this.events = this.node = this.host = null; + } +}); + } diff --git a/lib/dojo/dnd/Selector.js b/lib/dojo/dnd/Selector.js index 95c1bff47..9f13b75a0 100644 --- a/lib/dojo/dnd/Selector.js +++ b/lib/dojo/dnd/Selector.js @@ -5,235 +5,332 @@ */ -if(!dojo._hasResource["dojo.dnd.Selector"]){ -dojo._hasResource["dojo.dnd.Selector"]=true; +if(!dojo._hasResource["dojo.dnd.Selector"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Selector"] = true; dojo.provide("dojo.dnd.Selector"); + dojo.require("dojo.dnd.common"); dojo.require("dojo.dnd.Container"); -dojo.declare("dojo.dnd.Selector",dojo.dnd.Container,{constructor:function(_1,_2){ -if(!_2){ -_2={}; -} -this.singular=_2.singular; -this.autoSync=_2.autoSync; -this.selection={}; -this.anchor=null; -this.simpleSelection=false; -this.events.push(dojo.connect(this.node,"onmousedown",this,"onMouseDown"),dojo.connect(this.node,"onmouseup",this,"onMouseUp")); -},singular:false,getSelectedNodes:function(){ -var t=new dojo.NodeList(); -var e=dojo.dnd._empty; -for(var i in this.selection){ -if(i in e){ -continue; -} -t.push(dojo.byId(i)); -} -return t; -},selectNone:function(){ -return this._removeSelection()._removeAnchor(); -},selectAll:function(){ -this.forInItems(function(_3,id){ -this._addItemClass(dojo.byId(id),"Selected"); -this.selection[id]=1; -},this); -return this._removeAnchor(); -},deleteSelectedNodes:function(){ -var e=dojo.dnd._empty; -for(var i in this.selection){ -if(i in e){ -continue; -} -var n=dojo.byId(i); -this.delItem(i); -dojo.destroy(n); -} -this.anchor=null; -this.selection={}; -return this; -},forInSelectedItems:function(f,o){ -o=o||dojo.global; -var s=this.selection,e=dojo.dnd._empty; -for(var i in s){ -if(i in e){ -continue; -} -f.call(o,this.getItem(i),i,this); -} -},sync:function(){ -dojo.dnd.Selector.superclass.sync.call(this); -if(this.anchor){ -if(!this.getItem(this.anchor.id)){ -this.anchor=null; -} -} -var t=[],e=dojo.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){ -delete this.selection[i]; -},this); -return this; -},insertNodes:function(_4,_5,_6,_7){ -var _8=this._normalizedCreator; -this._normalizedCreator=function(_9,_a){ -var t=_8.call(this,_9,_a); -if(_4){ -if(!this.anchor){ -this.anchor=t.node; -this._removeItemClass(t.node,"Selected"); -this._addItemClass(this.anchor,"Anchor"); -}else{ -if(this.anchor!=t.node){ -this._removeItemClass(t.node,"Anchor"); -this._addItemClass(t.node,"Selected"); -} -} -this.selection[t.node.id]=1; -}else{ -this._removeItemClass(t.node,"Selected"); -this._removeItemClass(t.node,"Anchor"); -} -return t; -}; -dojo.dnd.Selector.superclass.insertNodes.call(this,_5,_6,_7); -this._normalizedCreator=_8; -return this; -},destroy:function(){ -dojo.dnd.Selector.superclass.destroy.call(this); -this.selection=this.anchor=null; -},markupFactory:function(_b,_c){ -_b._skipStartup=true; -return new dojo.dnd.Selector(_c,_b); -},onMouseDown:function(e){ -if(this.autoSync){ -this.sync(); -} -if(!this.current){ -return; -} -if(!this.singular&&!dojo.isCopyKey(e)&&!e.shiftKey&&(this.current.id in this.selection)){ -this.simpleSelection=true; -if(e.button===dojo.mouseButtons.LEFT){ -dojo.stopEvent(e); -} -return; -} -if(!this.singular&&e.shiftKey){ -if(!dojo.isCopyKey(e)){ -this._removeSelection(); -} -var c=this.getAllNodes(); -if(c.length){ -if(!this.anchor){ -this.anchor=c[0]; -this._addItemClass(this.anchor,"Anchor"); -} -this.selection[this.anchor.id]=1; -if(this.anchor!=this.current){ -var i=0; -for(;i<c.length;++i){ -var _d=c[i]; -if(_d==this.anchor||_d==this.current){ -break; -} -} -for(++i;i<c.length;++i){ -var _d=c[i]; -if(_d==this.anchor||_d==this.current){ -break; -} -this._addItemClass(_d,"Selected"); -this.selection[_d.id]=1; -} -this._addItemClass(this.current,"Selected"); -this.selection[this.current.id]=1; -} -} -}else{ -if(this.singular){ -if(this.anchor==this.current){ -if(dojo.isCopyKey(e)){ -this.selectNone(); -} -}else{ -this.selectNone(); -this.anchor=this.current; -this._addItemClass(this.anchor,"Anchor"); -this.selection[this.current.id]=1; -} -}else{ -if(dojo.isCopyKey(e)){ -if(this.anchor==this.current){ -delete this.selection[this.anchor.id]; -this._removeAnchor(); -}else{ -if(this.current.id in this.selection){ -this._removeItemClass(this.current,"Selected"); -delete this.selection[this.current.id]; -}else{ -if(this.anchor){ -this._removeItemClass(this.anchor,"Anchor"); -this._addItemClass(this.anchor,"Selected"); -} -this.anchor=this.current; -this._addItemClass(this.current,"Anchor"); -this.selection[this.current.id]=1; -} -} -}else{ -if(!(this.current.id in this.selection)){ -this.selectNone(); -this.anchor=this.current; -this._addItemClass(this.current,"Anchor"); -this.selection[this.current.id]=1; -} -} -} -} -dojo.stopEvent(e); -},onMouseUp:function(e){ -if(!this.simpleSelection){ -return; -} -this.simpleSelection=false; -this.selectNone(); -if(this.current){ -this.anchor=this.current; -this._addItemClass(this.anchor,"Anchor"); -this.selection[this.current.id]=1; -} -},onMouseMove:function(e){ -this.simpleSelection=false; -},onOverEvent:function(){ -this.onmousemoveEvent=dojo.connect(this.node,"onmousemove",this,"onMouseMove"); -},onOutEvent:function(){ -dojo.disconnect(this.onmousemoveEvent); -delete this.onmousemoveEvent; -},_removeSelection:function(){ -var e=dojo.dnd._empty; -for(var i in this.selection){ -if(i in e){ -continue; -} -var _e=dojo.byId(i); -if(_e){ -this._removeItemClass(_e,"Selected"); -} -} -this.selection={}; -return this; -},_removeAnchor:function(){ -if(this.anchor){ -this._removeItemClass(this.anchor,"Anchor"); -this.anchor=null; -} -return this; -}}); + +/* + Container item states: + "" - an item is not selected + "Selected" - an item is selected + "Anchor" - an item is selected, and is an anchor for a "shift" selection +*/ + +/*===== +dojo.declare("dojo.dnd.__SelectorArgs", [dojo.dnd.__ContainerArgs], { + // singular: Boolean + // allows selection of only one element, if true + singular: false, + + // autoSync: Boolean + // autosynchronizes the source with its list of DnD nodes, + autoSync: false +}); +=====*/ + +dojo.declare("dojo.dnd.Selector", dojo.dnd.Container, { + // summary: + // a Selector object, which knows how to select its children + + /*===== + // selection: Set<String> + // The set of id's that are currently selected, such that this.selection[id] == 1 + // if the node w/that id is selected. Can iterate over selected node's id's like: + // | for(var id in this.selection) + selection: {}, + =====*/ + + constructor: function(node, params){ + // summary: + // constructor of the Selector + // node: Node||String + // node or node's id to build the selector on + // params: dojo.dnd.__SelectorArgs? + // a dictionary of parameters + if(!params){ params = {}; } + this.singular = params.singular; + this.autoSync = params.autoSync; + // class-specific variables + this.selection = {}; + this.anchor = null; + this.simpleSelection = false; + // set up events + this.events.push( + dojo.connect(this.node, "onmousedown", this, "onMouseDown"), + dojo.connect(this.node, "onmouseup", this, "onMouseUp")); + }, + + // object attributes (for markup) + singular: false, // is singular property + + // methods + getSelectedNodes: function(){ + // summary: + // returns a list (an array) of selected nodes + var t = new dojo.NodeList(); + var e = dojo.dnd._empty; + for(var i in this.selection){ + if(i in e){ continue; } + t.push(dojo.byId(i)); + } + return t; // NodeList + }, + selectNone: function(){ + // summary: + // unselects all items + return this._removeSelection()._removeAnchor(); // self + }, + selectAll: function(){ + // summary: + // selects all items + this.forInItems(function(data, id){ + this._addItemClass(dojo.byId(id), "Selected"); + this.selection[id] = 1; + }, this); + return this._removeAnchor(); // self + }, + deleteSelectedNodes: function(){ + // summary: + // deletes all selected items + var e = dojo.dnd._empty; + for(var i in this.selection){ + if(i in e){ continue; } + var n = dojo.byId(i); + this.delItem(i); + dojo.destroy(n); + } + this.anchor = null; + this.selection = {}; + return this; // self + }, + 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; + for(var i in s){ + if(i in e){ continue; } + f.call(o, this.getItem(i), i, this); + } + }, + sync: function(){ + // summary: + // sync up the node list with the data map + + dojo.dnd.Selector.superclass.sync.call(this); + + // fix the anchor + if(this.anchor){ + if(!this.getItem(this.anchor.id)){ + this.anchor = null; + } + } + + // fix the selection + var t = [], e = dojo.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){ + delete this.selection[i]; + }, this); + + return this; // self + }, + insertNodes: function(addSelected, data, before, anchor){ + // summary: + // 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 + // a list of data items, which should be processed by the creator function + // before: Boolean + // insert before the anchor, if true, and after the anchor otherwise + // anchor: Node + // the anchor node to be used as a point of insertion + var oldCreator = this._normalizedCreator; + this._normalizedCreator = function(item, hint){ + var t = oldCreator.call(this, item, hint); + if(addSelected){ + if(!this.anchor){ + this.anchor = t.node; + this._removeItemClass(t.node, "Selected"); + this._addItemClass(this.anchor, "Anchor"); + }else if(this.anchor != t.node){ + this._removeItemClass(t.node, "Anchor"); + this._addItemClass(t.node, "Selected"); + } + this.selection[t.node.id] = 1; + }else{ + this._removeItemClass(t.node, "Selected"); + this._removeItemClass(t.node, "Anchor"); + } + return t; + }; + dojo.dnd.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); + this.selection = this.anchor = null; + }, + + // markup methods + markupFactory: function(params, node){ + params._skipStartup = true; + return new dojo.dnd.Selector(node, params); + }, + + // mouse events + onMouseDown: function(e){ + // summary: + // event processor for onmousedown + // e: Event + // 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)){ + this.simpleSelection = true; + if(e.button === dojo.mouseButtons.LEFT){ + // accept the left button and stop the event + // for IE we don't stop event when multiple buttons are pressed + dojo.stopEvent(e); + } + return; + } + if(!this.singular && e.shiftKey){ + if(!dojo.isCopyKey(e)){ + this._removeSelection(); + } + var c = this.getAllNodes(); + if(c.length){ + if(!this.anchor){ + this.anchor = c[0]; + this._addItemClass(this.anchor, "Anchor"); + } + this.selection[this.anchor.id] = 1; + if(this.anchor != this.current){ + var i = 0; + for(; i < c.length; ++i){ + var node = c[i]; + if(node == this.anchor || node == this.current){ break; } + } + for(++i; i < c.length; ++i){ + var node = c[i]; + if(node == this.anchor || node == this.current){ break; } + this._addItemClass(node, "Selected"); + this.selection[node.id] = 1; + } + this._addItemClass(this.current, "Selected"); + this.selection[this.current.id] = 1; + } + } + }else{ + if(this.singular){ + if(this.anchor == this.current){ + if(dojo.isCopyKey(e)){ + this.selectNone(); + } + }else{ + this.selectNone(); + this.anchor = this.current; + this._addItemClass(this.anchor, "Anchor"); + this.selection[this.current.id] = 1; + } + }else{ + if(dojo.isCopyKey(e)){ + if(this.anchor == this.current){ + delete this.selection[this.anchor.id]; + this._removeAnchor(); + }else{ + if(this.current.id in this.selection){ + this._removeItemClass(this.current, "Selected"); + delete this.selection[this.current.id]; + }else{ + if(this.anchor){ + this._removeItemClass(this.anchor, "Anchor"); + this._addItemClass(this.anchor, "Selected"); + } + this.anchor = this.current; + this._addItemClass(this.current, "Anchor"); + this.selection[this.current.id] = 1; + } + } + }else{ + if(!(this.current.id in this.selection)){ + this.selectNone(); + this.anchor = this.current; + this._addItemClass(this.current, "Anchor"); + this.selection[this.current.id] = 1; + } + } + } + } + dojo.stopEvent(e); + }, + onMouseUp: function(e){ + // summary: + // event processor for onmouseup + // e: Event + // mouse event + if(!this.simpleSelection){ return; } + this.simpleSelection = false; + this.selectNone(); + if(this.current){ + this.anchor = this.current; + this._addItemClass(this.anchor, "Anchor"); + this.selection[this.current.id] = 1; + } + }, + onMouseMove: function(e){ + // summary + // event processor for onmousemove + // e: Event + // mouse event + this.simpleSelection = false; + }, + + // utilities + onOverEvent: function(){ + // summary: + // this function is called once, when mouse is over our container + this.onmousemoveEvent = dojo.connect(this.node, "onmousemove", this, "onMouseMove"); + }, + onOutEvent: function(){ + // summary: + // this function is called once, when mouse is out of our container + dojo.disconnect(this.onmousemoveEvent); + delete this.onmousemoveEvent; + }, + _removeSelection: function(){ + // summary: + // unselects all items + var e = dojo.dnd._empty; + for(var i in this.selection){ + if(i in e){ continue; } + var node = dojo.byId(i); + if(node){ this._removeItemClass(node, "Selected"); } + } + this.selection = {}; + return this; // self + }, + _removeAnchor: function(){ + if(this.anchor){ + this._removeItemClass(this.anchor, "Anchor"); + this.anchor = null; + } + return this; // self + } +}); + } diff --git a/lib/dojo/dnd/Source.js b/lib/dojo/dnd/Source.js index fb05eb048..8e5c55dbc 100644 --- a/lib/dojo/dnd/Source.js +++ b/lib/dojo/dnd/Source.js @@ -5,294 +5,545 @@ */ -if(!dojo._hasResource["dojo.dnd.Source"]){ -dojo._hasResource["dojo.dnd.Source"]=true; +if(!dojo._hasResource["dojo.dnd.Source"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.Source"] = true; dojo.provide("dojo.dnd.Source"); + dojo.require("dojo.dnd.Selector"); dojo.require("dojo.dnd.Manager"); -dojo.declare("dojo.dnd.Source",dojo.dnd.Selector,{isSource:true,horizontal:false,copyOnly:false,selfCopy:false,selfAccept:true,skipForm:false,withHandles:false,autoSync:false,delay:0,accept:["text"],generateText:true,constructor:function(_1,_2){ -dojo.mixin(this,dojo.mixin({},_2)); -var _3=this.accept; -if(_3.length){ -this.accept={}; -for(var i=0;i<_3.length;++i){ -this.accept[_3[i]]=1; -} -} -this.isDragging=false; -this.mouseDown=false; -this.targetAnchor=null; -this.targetBox=null; -this.before=true; -this._lastX=0; -this._lastY=0; -this.sourceState=""; -if(this.isSource){ -dojo.addClass(this.node,"dojoDndSource"); -} -this.targetState=""; -if(this.accept){ -dojo.addClass(this.node,"dojoDndTarget"); -} -if(this.horizontal){ -dojo.addClass(this.node,"dojoDndHorizontal"); -} -this.topics=[dojo.subscribe("/dnd/source/over",this,"onDndSourceOver"),dojo.subscribe("/dnd/start",this,"onDndStart"),dojo.subscribe("/dnd/drop",this,"onDndDrop"),dojo.subscribe("/dnd/cancel",this,"onDndCancel")]; -},checkAcceptance:function(_4,_5){ -if(this==_4){ -return !this.copyOnly||this.selfAccept; -} -for(var i=0;i<_5.length;++i){ -var _6=_4.getItem(_5[i].id).type; -var _7=false; -for(var j=0;j<_6.length;++j){ -if(_6[j] in this.accept){ -_7=true; -break; -} -} -if(!_7){ -return false; -} -} -return true; -},copyState:function(_8,_9){ -if(_8){ -return true; -} -if(arguments.length<2){ -_9=this==dojo.dnd.manager().target; -} -if(_9){ -if(this.copyOnly){ -return this.selfCopy; -} -}else{ -return this.copyOnly; -} -return false; -},destroy:function(){ -dojo.dnd.Source.superclass.destroy.call(this); -dojo.forEach(this.topics,dojo.unsubscribe); -this.targetAnchor=null; -},markupFactory:function(_a,_b){ -_a._skipStartup=true; -return new dojo.dnd.Source(_b,_a); -},onMouseMove:function(e){ -if(this.isDragging&&this.targetState=="Disabled"){ -return; -} -dojo.dnd.Source.superclass.onMouseMove.call(this,e); -var m=dojo.dnd.manager(); -if(!this.isDragging){ -if(this.mouseDown&&this.isSource&&(Math.abs(e.pageX-this._lastX)>this.delay||Math.abs(e.pageY-this._lastY)>this.delay)){ -var _c=this.getSelectedNodes(); -if(_c.length){ -m.startDrag(this,_c,this.copyState(dojo.isCopyKey(e),true)); -} -} -} -if(this.isDragging){ -var _d=false; -if(this.current){ -if(!this.targetBox||this.targetAnchor!=this.current){ -this.targetBox=dojo.position(this.current,true); -} -if(this.horizontal){ -_d=(e.pageX-this.targetBox.x)<(this.targetBox.w/2); -}else{ -_d=(e.pageY-this.targetBox.y)<(this.targetBox.h/2); -} -} -if(this.current!=this.targetAnchor||_d!=this.before){ -this._markTargetAnchor(_d); -m.canDrop(!this.current||m.source!=this||!(this.current.id in this.selection)); -} -} -},onMouseDown:function(e){ -if(!this.mouseDown&&this._legalMouseDown(e)&&(!this.skipForm||!dojo.dnd.isFormElement(e))){ -this.mouseDown=true; -this._lastX=e.pageX; -this._lastY=e.pageY; -dojo.dnd.Source.superclass.onMouseDown.call(this,e); -} -},onMouseUp:function(e){ -if(this.mouseDown){ -this.mouseDown=false; -dojo.dnd.Source.superclass.onMouseUp.call(this,e); -} -},onDndSourceOver:function(_e){ -if(this!=_e){ -this.mouseDown=false; -if(this.targetAnchor){ -this._unmarkTargetAnchor(); -} -}else{ -if(this.isDragging){ -var m=dojo.dnd.manager(); -m.canDrop(this.targetState!="Disabled"&&(!this.current||m.source!=this||!(this.current.id in this.selection))); -} -} -},onDndStart:function(_f,_10,_11){ -if(this.autoSync){ -this.sync(); -} -if(this.isSource){ -this._changeState("Source",this==_f?(_11?"Copied":"Moved"):""); -} -var _12=this.accept&&this.checkAcceptance(_f,_10); -this._changeState("Target",_12?"":"Disabled"); -if(this==_f){ -dojo.dnd.manager().overSource(this); -} -this.isDragging=true; -},onDndDrop:function(_13,_14,_15,_16){ -if(this==_16){ -this.onDrop(_13,_14,_15); -} -this.onDndCancel(); -},onDndCancel:function(){ -if(this.targetAnchor){ -this._unmarkTargetAnchor(); -this.targetAnchor=null; -} -this.before=true; -this.isDragging=false; -this.mouseDown=false; -this._changeState("Source",""); -this._changeState("Target",""); -},onDrop:function(_17,_18,_19){ -if(this!=_17){ -this.onDropExternal(_17,_18,_19); -}else{ -this.onDropInternal(_18,_19); -} -},onDropExternal:function(_1a,_1b,_1c){ -var _1d=this._normalizedCreator; -if(this.creator){ -this._normalizedCreator=function(_1e,_1f){ -return _1d.call(this,_1a.getItem(_1e.id).data,_1f); -}; -}else{ -if(_1c){ -this._normalizedCreator=function(_20,_21){ -var t=_1a.getItem(_20.id); -var n=_20.cloneNode(true); -n.id=dojo.dnd.getUniqueId(); -return {node:n,data:t.data,type:t.type}; -}; -}else{ -this._normalizedCreator=function(_22,_23){ -var t=_1a.getItem(_22.id); -_1a.delItem(_22.id); -return {node:_22,data:t.data,type:t.type}; -}; -} -} -this.selectNone(); -if(!_1c&&!this.creator){ -_1a.selectNone(); -} -this.insertNodes(true,_1b,this.before,this.current); -if(!_1c&&this.creator){ -_1a.deleteSelectedNodes(); -} -this._normalizedCreator=_1d; -},onDropInternal:function(_24,_25){ -var _26=this._normalizedCreator; -if(this.current&&this.current.id in this.selection){ -return; -} -if(_25){ -if(this.creator){ -this._normalizedCreator=function(_27,_28){ -return _26.call(this,this.getItem(_27.id).data,_28); -}; -}else{ -this._normalizedCreator=function(_29,_2a){ -var t=this.getItem(_29.id); -var n=_29.cloneNode(true); -n.id=dojo.dnd.getUniqueId(); -return {node:n,data:t.data,type:t.type}; -}; -} -}else{ -if(!this.current){ -return; -} -this._normalizedCreator=function(_2b,_2c){ -var t=this.getItem(_2b.id); -return {node:_2b,data:t.data,type:t.type}; -}; -} -this._removeSelection(); -this.insertNodes(true,_24,this.before,this.current); -this._normalizedCreator=_26; -},onDraggingOver:function(){ -},onDraggingOut:function(){ -},onOverEvent:function(){ -dojo.dnd.Source.superclass.onOverEvent.call(this); -dojo.dnd.manager().overSource(this); -if(this.isDragging&&this.targetState!="Disabled"){ -this.onDraggingOver(); -} -},onOutEvent:function(){ -dojo.dnd.Source.superclass.onOutEvent.call(this); -dojo.dnd.manager().outSource(this); -if(this.isDragging&&this.targetState!="Disabled"){ -this.onDraggingOut(); -} -},_markTargetAnchor:function(_2d){ -if(this.current==this.targetAnchor&&this.before==_2d){ -return; -} -if(this.targetAnchor){ -this._removeItemClass(this.targetAnchor,this.before?"Before":"After"); -} -this.targetAnchor=this.current; -this.targetBox=null; -this.before=_2d; -if(this.targetAnchor){ -this._addItemClass(this.targetAnchor,this.before?"Before":"After"); -} -},_unmarkTargetAnchor:function(){ -if(!this.targetAnchor){ -return; -} -this._removeItemClass(this.targetAnchor,this.before?"Before":"After"); -this.targetAnchor=null; -this.targetBox=null; -this.before=true; -},_markDndStatus:function(_2e){ -this._changeState("Source",_2e?"Copied":"Moved"); -},_legalMouseDown:function(e){ -if(!dojo.mouseButtons.isLeft(e)){ -return false; -} -if(!this.withHandles){ -return true; -} -for(var _2f=e.target;_2f&&_2f!==this.node;_2f=_2f.parentNode){ -if(dojo.hasClass(_2f,"dojoDndHandle")){ -return true; -} -if(dojo.hasClass(_2f,"dojoDndItem")||dojo.hasClass(_2f,"dojoDndIgnore")){ -break; -} -} -return false; -}}); -dojo.declare("dojo.dnd.Target",dojo.dnd.Source,{constructor:function(_30,_31){ -this.isSource=false; -dojo.removeClass(this.node,"dojoDndSource"); -},markupFactory:function(_32,_33){ -_32._skipStartup=true; -return new dojo.dnd.Target(_33,_32); -}}); -dojo.declare("dojo.dnd.AutoSource",dojo.dnd.Source,{constructor:function(_34,_35){ -this.autoSync=true; -},markupFactory:function(_36,_37){ -_36._skipStartup=true; -return new dojo.dnd.AutoSource(_37,_36); -}}); + +/* + Container property: + "Horizontal"- if this is the horizontal container + Source states: + "" - normal state + "Moved" - this source is being moved + "Copied" - this source is being copied + Target states: + "" - normal state + "Disabled" - the target cannot accept an avatar + Target anchor state: + "" - item is not selected + "Before" - insert point is before the anchor + "After" - insert point is after the anchor +*/ + +/*===== +dojo.dnd.__SourceArgs = function(){ + // summary: + // a dict of parameters for DnD Source configuration. Note that any + // property on Source elements may be configured, but this is the + // short-list + // isSource: Boolean? + // can be used as a DnD source. Defaults to true. + // accept: Array? + // list of accepted types (text strings) for a target; defaults to + // ["text"] + // autoSync: Boolean + // if true refreshes the node list on every operation; false by default + // copyOnly: Boolean? + // copy items, if true, use a state of Ctrl key otherwise, + // see selfCopy and selfAccept for more details + // delay: Number + // the move delay in pixels before detecting a drag; 0 by default + // horizontal: Boolean? + // a horizontal container, if true, vertical otherwise or when omitted + // selfCopy: Boolean? + // copy items by default when dropping on itself, + // false by default, works only if copyOnly is true + // selfAccept: Boolean? + // accept its own items when copyOnly is true, + // true by default, works only if copyOnly is true + // withHandles: Boolean? + // allows dragging only by handles, false by default + // generateText: Boolean? + // generate text node for drag and drop, true by default + this.isSource = isSource; + this.accept = accept; + this.autoSync = autoSync; + this.copyOnly = copyOnly; + this.delay = delay; + this.horizontal = horizontal; + this.selfCopy = selfCopy; + this.selfAccept = selfAccept; + this.withHandles = withHandles; + this.generateText = true; +} +=====*/ + +dojo.declare("dojo.dnd.Source", dojo.dnd.Selector, { + // summary: + // a Source object, which can be used as a DnD source, or a DnD target + + // object attributes (for markup) + isSource: true, + horizontal: false, + copyOnly: false, + selfCopy: false, + selfAccept: true, + skipForm: false, + withHandles: false, + autoSync: false, + delay: 0, // pixels + accept: ["text"], + generateText: true, + + constructor: function(/*DOMNode|String*/node, /*dojo.dnd.__SourceArgs?*/params){ + // summary: + // a constructor of the Source + // node: + // node or node's id to build the source on + // params: + // any property of this class may be configured via the params + // object which is mixed-in to the `dojo.dnd.Source` instance + dojo.mixin(this, dojo.mixin({}, params)); + var type = this.accept; + if(type.length){ + this.accept = {}; + for(var i = 0; i < type.length; ++i){ + this.accept[type[i]] = 1; + } + } + // class-specific variables + this.isDragging = false; + this.mouseDown = false; + this.targetAnchor = null; + this.targetBox = null; + this.before = true; + this._lastX = 0; + this._lastY = 0; + // states + this.sourceState = ""; + if(this.isSource){ + dojo.addClass(this.node, "dojoDndSource"); + } + this.targetState = ""; + if(this.accept){ + dojo.addClass(this.node, "dojoDndTarget"); + } + if(this.horizontal){ + dojo.addClass(this.node, "dojoDndHorizontal"); + } + // set up events + this.topics = [ + dojo.subscribe("/dnd/source/over", this, "onDndSourceOver"), + dojo.subscribe("/dnd/start", this, "onDndStart"), + dojo.subscribe("/dnd/drop", this, "onDndDrop"), + dojo.subscribe("/dnd/cancel", this, "onDndCancel") + ]; + }, + + // methods + checkAcceptance: function(source, nodes){ + // summary: + // checks if the target can accept nodes from this source + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + if(this == source){ + return !this.copyOnly || this.selfAccept; + } + for(var i = 0; i < nodes.length; ++i){ + var type = source.getItem(nodes[i].id).type; + // type instanceof Array + var flag = false; + for(var j = 0; j < type.length; ++j){ + if(type[j] in this.accept){ + flag = true; + break; + } + } + if(!flag){ + return false; // Boolean + } + } + return true; // Boolean + }, + copyState: function(keyPressed, self){ + // summary: + // Returns true if we need to copy items, false to move. + // It is separated to be overwritten dynamically, if needed. + // keyPressed: Boolean + // the "copy" key was pressed + // self: Boolean? + // optional flag that means that we are about to drop on itself + + if(keyPressed){ return true; } + if(arguments.length < 2){ + self = this == dojo.dnd.manager().target; + } + if(self){ + if(this.copyOnly){ + return this.selfCopy; + } + }else{ + return this.copyOnly; + } + return false; // Boolean + }, + destroy: function(){ + // summary: + // prepares the object to be garbage-collected + dojo.dnd.Source.superclass.destroy.call(this); + dojo.forEach(this.topics, dojo.unsubscribe); + this.targetAnchor = null; + }, + + // markup methods + markupFactory: function(params, node){ + params._skipStartup = true; + return new dojo.dnd.Source(node, params); + }, + + // mouse event processors + onMouseMove: function(e){ + // summary: + // event processor for onmousemove + // e: Event + // mouse event + if(this.isDragging && this.targetState == "Disabled"){ return; } + dojo.dnd.Source.superclass.onMouseMove.call(this, e); + var m = dojo.dnd.manager(); + if(!this.isDragging){ + if(this.mouseDown && this.isSource && + (Math.abs(e.pageX - this._lastX) > this.delay || Math.abs(e.pageY - this._lastY) > this.delay)){ + var nodes = this.getSelectedNodes(); + if(nodes.length){ + m.startDrag(this, nodes, this.copyState(dojo.isCopyKey(e), true)); + } + } + } + if(this.isDragging){ + // calculate before/after + var before = false; + if(this.current){ + if(!this.targetBox || this.targetAnchor != this.current){ + this.targetBox = dojo.position(this.current, true); + } + if(this.horizontal){ + before = (e.pageX - this.targetBox.x) < (this.targetBox.w / 2); + }else{ + before = (e.pageY - this.targetBox.y) < (this.targetBox.h / 2); + } + } + if(this.current != this.targetAnchor || before != this.before){ + this._markTargetAnchor(before); + m.canDrop(!this.current || m.source != this || !(this.current.id in this.selection)); + } + } + }, + onMouseDown: function(e){ + // summary: + // event processor for onmousedown + // e: Event + // mouse event + if(!this.mouseDown && this._legalMouseDown(e) && (!this.skipForm || !dojo.dnd.isFormElement(e))){ + this.mouseDown = true; + this._lastX = e.pageX; + this._lastY = e.pageY; + dojo.dnd.Source.superclass.onMouseDown.call(this, e); + } + }, + onMouseUp: function(e){ + // summary: + // event processor for onmouseup + // e: Event + // mouse event + if(this.mouseDown){ + this.mouseDown = false; + dojo.dnd.Source.superclass.onMouseUp.call(this, e); + } + }, + + // topic event processors + onDndSourceOver: function(source){ + // summary: + // topic event processor for /dnd/source/over, called when detected a current source + // source: Object + // the source which has the mouse over it + if(this != source){ + this.mouseDown = false; + if(this.targetAnchor){ + this._unmarkTargetAnchor(); + } + }else if(this.isDragging){ + var m = dojo.dnd.manager(); + m.canDrop(this.targetState != "Disabled" && (!this.current || m.source != this || !(this.current.id in this.selection))); + } + }, + onDndStart: function(source, nodes, copy){ + // summary: + // topic event processor for /dnd/start, called to initiate the DnD operation + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + if(this.autoSync){ this.sync(); } + if(this.isSource){ + this._changeState("Source", this == source ? (copy ? "Copied" : "Moved") : ""); + } + var accepted = this.accept && this.checkAcceptance(source, nodes); + this._changeState("Target", accepted ? "" : "Disabled"); + if(this == source){ + dojo.dnd.manager().overSource(this); + } + this.isDragging = true; + }, + onDndDrop: function(source, nodes, copy, target){ + // summary: + // topic event processor for /dnd/drop, called to finish the DnD operation + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + // target: Object + // the target which accepts items + if(this == target){ + // this one is for us => move nodes! + this.onDrop(source, nodes, copy); + } + this.onDndCancel(); + }, + onDndCancel: function(){ + // summary: + // topic event processor for /dnd/cancel, called to cancel the DnD operation + if(this.targetAnchor){ + this._unmarkTargetAnchor(); + this.targetAnchor = null; + } + this.before = true; + this.isDragging = false; + this.mouseDown = false; + this._changeState("Source", ""); + this._changeState("Target", ""); + }, + + // local events + onDrop: function(source, nodes, copy){ + // summary: + // called only on the current target, when drop is performed + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + + if(this != source){ + this.onDropExternal(source, nodes, copy); + }else{ + this.onDropInternal(nodes, copy); + } + }, + onDropExternal: function(source, nodes, copy){ + // summary: + // called only on the current target, when drop is performed + // from an external source + // source: Object + // the source which provides items + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + + var oldCreator = this._normalizedCreator; + // transferring nodes from the source to the target + if(this.creator){ + // use defined creator + this._normalizedCreator = function(node, hint){ + return oldCreator.call(this, source.getItem(node.id).data, hint); + }; + }else{ + // we have no creator defined => move/clone nodes + if(copy){ + // clone nodes + this._normalizedCreator = function(node, hint){ + var t = source.getItem(node.id); + var n = node.cloneNode(true); + n.id = dojo.dnd.getUniqueId(); + return {node: n, data: t.data, type: t.type}; + }; + }else{ + // move nodes + this._normalizedCreator = function(node, hint){ + var t = source.getItem(node.id); + source.delItem(node.id); + return {node: node, data: t.data, type: t.type}; + }; + } + } + this.selectNone(); + if(!copy && !this.creator){ + source.selectNone(); + } + this.insertNodes(true, nodes, this.before, this.current); + if(!copy && this.creator){ + source.deleteSelectedNodes(); + } + this._normalizedCreator = oldCreator; + }, + onDropInternal: function(nodes, copy){ + // summary: + // called only on the current target, when drop is performed + // from the same target/source + // nodes: Array + // the list of transferred items + // copy: Boolean + // copy items, if true, move items otherwise + + var oldCreator = this._normalizedCreator; + // transferring nodes within the single source + if(this.current && this.current.id in this.selection){ + // do nothing + return; + } + if(copy){ + if(this.creator){ + // create new copies of data items + this._normalizedCreator = function(node, hint){ + return oldCreator.call(this, this.getItem(node.id).data, hint); + }; + }else{ + // clone nodes + this._normalizedCreator = function(node, hint){ + var t = this.getItem(node.id); + var n = node.cloneNode(true); + n.id = dojo.dnd.getUniqueId(); + return {node: n, data: t.data, type: t.type}; + }; + } + }else{ + // move nodes + if(!this.current){ + // do nothing + return; + } + this._normalizedCreator = function(node, hint){ + var t = this.getItem(node.id); + return {node: node, data: t.data, type: t.type}; + }; + } + this._removeSelection(); + this.insertNodes(true, nodes, this.before, this.current); + this._normalizedCreator = oldCreator; + }, + onDraggingOver: function(){ + // summary: + // called during the active DnD operation, when items + // are dragged over this target, and it is not disabled + }, + onDraggingOut: function(){ + // summary: + // called during the active DnD operation, when items + // are dragged away from this target, and it is not disabled + }, + + // utilities + onOverEvent: function(){ + // summary: + // this function is called once, when mouse is over our container + dojo.dnd.Source.superclass.onOverEvent.call(this); + dojo.dnd.manager().overSource(this); + if(this.isDragging && this.targetState != "Disabled"){ + this.onDraggingOver(); + } + }, + onOutEvent: function(){ + // summary: + // this function is called once, when mouse is out of our container + dojo.dnd.Source.superclass.onOutEvent.call(this); + dojo.dnd.manager().outSource(this); + if(this.isDragging && this.targetState != "Disabled"){ + this.onDraggingOut(); + } + }, + _markTargetAnchor: function(before){ + // summary: + // assigns a class to the current target anchor based on "before" status + // before: Boolean + // insert before, if true, after otherwise + if(this.current == this.targetAnchor && this.before == before){ return; } + if(this.targetAnchor){ + this._removeItemClass(this.targetAnchor, this.before ? "Before" : "After"); + } + this.targetAnchor = this.current; + this.targetBox = null; + this.before = before; + if(this.targetAnchor){ + this._addItemClass(this.targetAnchor, this.before ? "Before" : "After"); + } + }, + _unmarkTargetAnchor: function(){ + // summary: + // removes a class of the current target anchor based on "before" status + if(!this.targetAnchor){ return; } + this._removeItemClass(this.targetAnchor, this.before ? "Before" : "After"); + this.targetAnchor = null; + this.targetBox = null; + this.before = true; + }, + _markDndStatus: function(copy){ + // summary: + // changes source's state based on "copy" status + this._changeState("Source", copy ? "Copied" : "Moved"); + }, + _legalMouseDown: function(e){ + // summary: + // checks if user clicked on "approved" items + // e: Event + // mouse event + + // accept only the left mouse button + if(!dojo.mouseButtons.isLeft(e)){ return false; } + + if(!this.withHandles){ return true; } + + // check for handles + for(var node = e.target; node && node !== this.node; node = node.parentNode){ + if(dojo.hasClass(node, "dojoDndHandle")){ return true; } + if(dojo.hasClass(node, "dojoDndItem") || dojo.hasClass(node, "dojoDndIgnore")){ break; } + } + return false; // Boolean + } +}); + +dojo.declare("dojo.dnd.Target", dojo.dnd.Source, { + // summary: a Target object, which can be used as a DnD target + + constructor: function(node, params){ + // summary: + // a constructor of the Target --- see the `dojo.dnd.Source.constructor` for details + this.isSource = false; + dojo.removeClass(this.node, "dojoDndSource"); + }, + + // markup methods + markupFactory: function(params, node){ + params._skipStartup = true; + return new dojo.dnd.Target(node, params); + } +}); + +dojo.declare("dojo.dnd.AutoSource", dojo.dnd.Source, { + // summary: + // a source that syncs its DnD nodes by default + + constructor: function(node, params){ + // summary: + // constructor of the AutoSource --- see the Source constructor for details + this.autoSync = true; + }, + + // markup methods + markupFactory: function(params, node){ + params._skipStartup = true; + return new dojo.dnd.AutoSource(node, params); + } +}); + } diff --git a/lib/dojo/dnd/TimedMoveable.js b/lib/dojo/dnd/TimedMoveable.js index 05609a379..25a101e20 100644 --- a/lib/dojo/dnd/TimedMoveable.js +++ b/lib/dojo/dnd/TimedMoveable.js @@ -5,36 +5,77 @@ */ -if(!dojo._hasResource["dojo.dnd.TimedMoveable"]){ -dojo._hasResource["dojo.dnd.TimedMoveable"]=true; +if(!dojo._hasResource["dojo.dnd.TimedMoveable"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.TimedMoveable"] = true; dojo.provide("dojo.dnd.TimedMoveable"); + dojo.require("dojo.dnd.Moveable"); + +/*===== +dojo.declare("dojo.dnd.__TimedMoveableArgs", [dojo.dnd.__MoveableArgs], { + // timeout: Number + // delay move by this number of ms, + // accumulating position changes during the timeout + timeout: 0 +}); +=====*/ + (function(){ -var _1=dojo.dnd.Moveable.prototype.onMove; -dojo.declare("dojo.dnd.TimedMoveable",dojo.dnd.Moveable,{timeout:40,constructor:function(_2,_3){ -if(!_3){ -_3={}; -} -if(_3.timeout&&typeof _3.timeout=="number"&&_3.timeout>=0){ -this.timeout=_3.timeout; -} -},markupFactory:function(_4,_5){ -return new dojo.dnd.TimedMoveable(_5,_4); -},onMoveStop:function(_6){ -if(_6._timer){ -clearTimeout(_6._timer); -_1.call(this,_6,_6._leftTop); -} -dojo.dnd.Moveable.prototype.onMoveStop.apply(this,arguments); -},onMove:function(_7,_8){ -_7._leftTop=_8; -if(!_7._timer){ -var _9=this; -_7._timer=setTimeout(function(){ -_7._timer=null; -_1.call(_9,_7,_7._leftTop); -},this.timeout); -} -}}); + // precalculate long expressions + var oldOnMove = dojo.dnd.Moveable.prototype.onMove; + + dojo.declare("dojo.dnd.TimedMoveable", dojo.dnd.Moveable, { + // summary: + // A specialized version of Moveable to support an FPS throttling. + // This class puts an upper restriction on FPS, which may reduce + // the CPU load. The additional parameter "timeout" regulates + // the delay before actually moving the moveable object. + + // object attributes (for markup) + timeout: 40, // in ms, 40ms corresponds to 25 fps + + constructor: function(node, params){ + // summary: + // an object that makes a node moveable with a timer + // node: Node||String + // a node (or node's id) to be moved + // params: dojo.dnd.__TimedMoveableArgs + // object with additional parameters. + + // sanitize parameters + if(!params){ params = {}; } + if(params.timeout && typeof params.timeout == "number" && params.timeout >= 0){ + this.timeout = params.timeout; + } + }, + + // markup methods + markupFactory: function(params, node){ + return new dojo.dnd.TimedMoveable(node, params); + }, + + onMoveStop: function(/* dojo.dnd.Mover */ mover){ + if(mover._timer){ + // stop timer + clearTimeout(mover._timer) + // reflect the last received position + oldOnMove.call(this, mover, mover._leftTop) + } + dojo.dnd.Moveable.prototype.onMoveStop.apply(this, arguments); + }, + onMove: function(/* dojo.dnd.Mover */ mover, /* Object */ leftTop){ + mover._leftTop = leftTop; + if(!mover._timer){ + var _t = this; // to avoid using dojo.hitch() + mover._timer = setTimeout(function(){ + // we don't have any pending requests + mover._timer = null; + // reflect the last received position + oldOnMove.call(_t, mover, mover._leftTop); + }, this.timeout); + } + } + }); })(); + } diff --git a/lib/dojo/dnd/autoscroll.js b/lib/dojo/dnd/autoscroll.js index 27496c6cd..40daf66a1 100644 --- a/lib/dojo/dnd/autoscroll.js +++ b/lib/dojo/dnd/autoscroll.js @@ -5,95 +5,112 @@ */ -if(!dojo._hasResource["dojo.dnd.autoscroll"]){ -dojo._hasResource["dojo.dnd.autoscroll"]=true; +if(!dojo._hasResource["dojo.dnd.autoscroll"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.autoscroll"] = true; dojo.provide("dojo.dnd.autoscroll"); -dojo.dnd.getViewport=function(){ -var d=dojo.doc,dd=d.documentElement,w=window,b=dojo.body(); -if(dojo.isMozilla){ -return {w:dd.clientWidth,h:w.innerHeight}; -}else{ -if(!dojo.isOpera&&w.innerWidth){ -return {w:w.innerWidth,h:w.innerHeight}; -}else{ -if(!dojo.isOpera&&dd&&dd.clientWidth){ -return {w:dd.clientWidth,h:dd.clientHeight}; -}else{ -if(b.clientWidth){ -return {w:b.clientWidth,h:b.clientHeight}; -} -} -} -} -return null; + +dojo.dnd.getViewport = function(){ + // summary: + // Returns a viewport size (visible part of the window) + + // TODO: remove this when getViewport() moved to dojo core, see #7028 + + // FIXME: need more docs!! + var d = dojo.doc, dd = d.documentElement, w = window, b = dojo.body(); + if(dojo.isMozilla){ + return {w: dd.clientWidth, h: w.innerHeight}; // Object + }else if(!dojo.isOpera && w.innerWidth){ + return {w: w.innerWidth, h: w.innerHeight}; // Object + }else if (!dojo.isOpera && dd && dd.clientWidth){ + return {w: dd.clientWidth, h: dd.clientHeight}; // Object + }else if (b.clientWidth){ + return {w: b.clientWidth, h: b.clientHeight}; // Object + } + return null; // Object }; -dojo.dnd.V_TRIGGER_AUTOSCROLL=32; -dojo.dnd.H_TRIGGER_AUTOSCROLL=32; -dojo.dnd.V_AUTOSCROLL_VALUE=16; -dojo.dnd.H_AUTOSCROLL_VALUE=16; -dojo.dnd.autoScroll=function(e){ -var v=dojo.dnd.getViewport(),dx=0,dy=0; -if(e.clientX<dojo.dnd.H_TRIGGER_AUTOSCROLL){ -dx=-dojo.dnd.H_AUTOSCROLL_VALUE; -}else{ -if(e.clientX>v.w-dojo.dnd.H_TRIGGER_AUTOSCROLL){ -dx=dojo.dnd.H_AUTOSCROLL_VALUE; -} -} -if(e.clientY<dojo.dnd.V_TRIGGER_AUTOSCROLL){ -dy=-dojo.dnd.V_AUTOSCROLL_VALUE; -}else{ -if(e.clientY>v.h-dojo.dnd.V_TRIGGER_AUTOSCROLL){ -dy=dojo.dnd.V_AUTOSCROLL_VALUE; -} -} -window.scrollBy(dx,dy); + +dojo.dnd.V_TRIGGER_AUTOSCROLL = 32; +dojo.dnd.H_TRIGGER_AUTOSCROLL = 32; + +dojo.dnd.V_AUTOSCROLL_VALUE = 16; +dojo.dnd.H_AUTOSCROLL_VALUE = 16; + +dojo.dnd.autoScroll = function(e){ + // summary: + // a handler for onmousemove event, which scrolls the window, if + // necesary + // e: Event + // onmousemove event + + // FIXME: needs more docs! + var v = dojo.dnd.getViewport(), dx = 0, dy = 0; + if(e.clientX < dojo.dnd.H_TRIGGER_AUTOSCROLL){ + dx = -dojo.dnd.H_AUTOSCROLL_VALUE; + }else if(e.clientX > v.w - dojo.dnd.H_TRIGGER_AUTOSCROLL){ + dx = dojo.dnd.H_AUTOSCROLL_VALUE; + } + if(e.clientY < dojo.dnd.V_TRIGGER_AUTOSCROLL){ + dy = -dojo.dnd.V_AUTOSCROLL_VALUE; + }else if(e.clientY > v.h - dojo.dnd.V_TRIGGER_AUTOSCROLL){ + dy = dojo.dnd.V_AUTOSCROLL_VALUE; + } + window.scrollBy(dx, dy); }; -dojo.dnd._validNodes={"div":1,"p":1,"td":1}; -dojo.dnd._validOverflow={"auto":1,"scroll":1}; -dojo.dnd.autoScrollNodes=function(e){ -for(var n=e.target;n;){ -if(n.nodeType==1&&(n.tagName.toLowerCase() in dojo.dnd._validNodes)){ -var s=dojo.getComputedStyle(n); -if(s.overflow.toLowerCase() in dojo.dnd._validOverflow){ -var b=dojo._getContentBox(n,s),t=dojo.position(n,true); -var w=Math.min(dojo.dnd.H_TRIGGER_AUTOSCROLL,b.w/2),h=Math.min(dojo.dnd.V_TRIGGER_AUTOSCROLL,b.h/2),rx=e.pageX-t.x,ry=e.pageY-t.y,dx=0,dy=0; -if(dojo.isWebKit||dojo.isOpera){ -rx+=dojo.body().scrollLeft,ry+=dojo.body().scrollTop; -} -if(rx>0&&rx<b.w){ -if(rx<w){ -dx=-w; -}else{ -if(rx>b.w-w){ -dx=w; -} -} -} -if(ry>0&&ry<b.h){ -if(ry<h){ -dy=-h; -}else{ -if(ry>b.h-h){ -dy=h; -} -} -} -var _1=n.scrollLeft,_2=n.scrollTop; -n.scrollLeft=n.scrollLeft+dx; -n.scrollTop=n.scrollTop+dy; -if(_1!=n.scrollLeft||_2!=n.scrollTop){ -return; -} -} -} -try{ -n=n.parentNode; -} -catch(x){ -n=null; -} -} -dojo.dnd.autoScroll(e); + +dojo.dnd._validNodes = {"div": 1, "p": 1, "td": 1}; +dojo.dnd._validOverflow = {"auto": 1, "scroll": 1}; + +dojo.dnd.autoScrollNodes = function(e){ + // summary: + // a handler for onmousemove event, which scrolls the first avaialble + // Dom element, it falls back to dojo.dnd.autoScroll() + // e: Event + // onmousemove event + + // FIXME: needs more docs! + for(var n = e.target; n;){ + if(n.nodeType == 1 && (n.tagName.toLowerCase() in dojo.dnd._validNodes)){ + var s = dojo.getComputedStyle(n); + if(s.overflow.toLowerCase() in dojo.dnd._validOverflow){ + var b = dojo._getContentBox(n, s), t = dojo.position(n, true); + //console.log(b.l, b.t, t.x, t.y, n.scrollLeft, n.scrollTop); + var w = Math.min(dojo.dnd.H_TRIGGER_AUTOSCROLL, b.w / 2), + h = Math.min(dojo.dnd.V_TRIGGER_AUTOSCROLL, b.h / 2), + rx = e.pageX - t.x, ry = e.pageY - t.y, dx = 0, dy = 0; + if(dojo.isWebKit || dojo.isOpera){ + // FIXME: this code should not be here, it should be taken into account + // either by the event fixing code, or the dojo.position() + // FIXME: this code doesn't work on Opera 9.5 Beta + rx += dojo.body().scrollLeft, ry += dojo.body().scrollTop; + } + if(rx > 0 && rx < b.w){ + if(rx < w){ + dx = -w; + }else if(rx > b.w - w){ + dx = w; + } + } + //console.log("ry =", ry, "b.h =", b.h, "h =", h); + if(ry > 0 && ry < b.h){ + if(ry < h){ + dy = -h; + }else if(ry > b.h - h){ + dy = h; + } + } + var oldLeft = n.scrollLeft, oldTop = n.scrollTop; + n.scrollLeft = n.scrollLeft + dx; + n.scrollTop = n.scrollTop + dy; + if(oldLeft != n.scrollLeft || oldTop != n.scrollTop){ return; } + } + } + try{ + n = n.parentNode; + }catch(x){ + n = null; + } + } + dojo.dnd.autoScroll(e); }; + } diff --git a/lib/dojo/dnd/common.js b/lib/dojo/dnd/common.js index d2d18f75a..e49552919 100644 --- a/lib/dojo/dnd/common.js +++ b/lib/dojo/dnd/common.js @@ -5,24 +5,33 @@ */ -if(!dojo._hasResource["dojo.dnd.common"]){ -dojo._hasResource["dojo.dnd.common"]=true; +if(!dojo._hasResource["dojo.dnd.common"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.common"] = true; dojo.provide("dojo.dnd.common"); -dojo.dnd.getCopyKeyState=dojo.isCopyKey; -dojo.dnd._uniqueId=0; -dojo.dnd.getUniqueId=function(){ -var id; -do{ -id=dojo._scopeName+"Unique"+(++dojo.dnd._uniqueId); -}while(dojo.byId(id)); -return id; + +dojo.dnd.getCopyKeyState = dojo.isCopyKey; + +dojo.dnd._uniqueId = 0; +dojo.dnd.getUniqueId = function(){ + // summary: + // returns a unique string for use with any DOM element + var id; + do{ + id = dojo._scopeName + "Unique" + (++dojo.dnd._uniqueId); + }while(dojo.byId(id)); + return id; }; -dojo.dnd._empty={}; -dojo.dnd.isFormElement=function(e){ -var t=e.target; -if(t.nodeType==3){ -t=t.parentNode; -} -return " button textarea input select option ".indexOf(" "+t.tagName.toLowerCase()+" ")>=0; + +dojo.dnd._empty = {}; + +dojo.dnd.isFormElement = function(/*Event*/ e){ + // summary: + // returns true if user clicked on a form element + var t = e.target; + if(t.nodeType == 3 /*TEXT_NODE*/){ + t = t.parentNode; + } + return " button textarea input select option ".indexOf(" " + t.tagName.toLowerCase() + " ") >= 0; // Boolean }; + } diff --git a/lib/dojo/dnd/move.js b/lib/dojo/dnd/move.js index af7cd98dc..f2abc1b41 100644 --- a/lib/dojo/dnd/move.js +++ b/lib/dojo/dnd/move.js @@ -5,121 +5,250 @@ */ -if(!dojo._hasResource["dojo.dnd.move"]){ -dojo._hasResource["dojo.dnd.move"]=true; +if(!dojo._hasResource["dojo.dnd.move"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. +dojo._hasResource["dojo.dnd.move"] = true; dojo.provide("dojo.dnd.move"); + dojo.require("dojo.dnd.Mover"); dojo.require("dojo.dnd.Moveable"); -dojo.declare("dojo.dnd.move.constrainedMoveable",dojo.dnd.Moveable,{constraints:function(){ -},within:false,markupFactory:function(_1,_2){ -return new dojo.dnd.move.constrainedMoveable(_2,_1); -},constructor:function(_3,_4){ -if(!_4){ -_4={}; -} -this.constraints=_4.constraints; -this.within=_4.within; -},onFirstMove:function(_5){ -var c=this.constraintBox=this.constraints.call(this,_5); -c.r=c.l+c.w; -c.b=c.t+c.h; -if(this.within){ -var mb=dojo.marginBox(_5.node); -c.r-=mb.w; -c.b-=mb.h; -} -},onMove:function(_6,_7){ -var c=this.constraintBox,s=_6.node.style; -s.left=(_7.l<c.l?c.l:c.r<_7.l?c.r:_7.l)+"px"; -s.top=(_7.t<c.t?c.t:c.b<_7.t?c.b:_7.t)+"px"; -}}); -dojo.declare("dojo.dnd.move.boxConstrainedMoveable",dojo.dnd.move.constrainedMoveable,{box:{},markupFactory:function(_8,_9){ -return new dojo.dnd.move.boxConstrainedMoveable(_9,_8); -},constructor:function(_a,_b){ -var _c=_b&&_b.box; -this.constraints=function(){ -return _c; -}; -}}); -dojo.declare("dojo.dnd.move.parentConstrainedMoveable",dojo.dnd.move.constrainedMoveable,{area:"content",markupFactory:function(_d,_e){ -return new dojo.dnd.move.parentConstrainedMoveable(_e,_d); -},constructor:function(_f,_10){ -var _11=_10&&_10.area; -this.constraints=function(){ -var n=this.node.parentNode,s=dojo.getComputedStyle(n),mb=dojo._getMarginBox(n,s); -if(_11=="margin"){ -return mb; -} -var t=dojo._getMarginExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -if(_11=="border"){ -return mb; -} -t=dojo._getBorderExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -if(_11=="padding"){ -return mb; -} -t=dojo._getPadExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -return mb; -}; -}}); -dojo.dnd.move.constrainedMover=function(fun,_12){ -dojo.deprecated("dojo.dnd.move.constrainedMover, use dojo.dnd.move.constrainedMoveable instead"); -var _13=function(_14,e,_15){ -dojo.dnd.Mover.call(this,_14,e,_15); -}; -dojo.extend(_13,dojo.dnd.Mover.prototype); -dojo.extend(_13,{onMouseMove:function(e){ -dojo.dnd.autoScroll(e); -var m=this.marginBox,c=this.constraintBox,l=m.l+e.pageX,t=m.t+e.pageY; -l=l<c.l?c.l:c.r<l?c.r:l; -t=t<c.t?c.t:c.b<t?c.b:t; -this.host.onMove(this,{l:l,t:t}); -},onFirstMove:function(){ -dojo.dnd.Mover.prototype.onFirstMove.call(this); -var c=this.constraintBox=fun.call(this); -c.r=c.l+c.w; -c.b=c.t+c.h; -if(_12){ -var mb=dojo.marginBox(this.node); -c.r-=mb.w; -c.b-=mb.h; -} -}}); -return _13; -}; -dojo.dnd.move.boxConstrainedMover=function(box,_16){ -dojo.deprecated("dojo.dnd.move.boxConstrainedMover, use dojo.dnd.move.boxConstrainedMoveable instead"); -return dojo.dnd.move.constrainedMover(function(){ -return box; -},_16); + +/*===== +dojo.declare("dojo.dnd.move.__constrainedMoveableArgs", [dojo.dnd.__MoveableArgs], { + // constraints: Function + // Calculates a constraint box. + // It is called in a context of the moveable object. + constraints: function(){}, + + // within: Boolean + // restrict move within boundaries. + within: false +}); +=====*/ + +dojo.declare("dojo.dnd.move.constrainedMoveable", dojo.dnd.Moveable, { + // object attributes (for markup) + constraints: function(){}, + within: false, + + // markup methods + markupFactory: function(params, node){ + return new dojo.dnd.move.constrainedMoveable(node, params); + }, + + constructor: function(node, params){ + // summary: + // an object that makes a node moveable + // node: Node + // a node (or node's id) to be moved + // params: dojo.dnd.move.__constrainedMoveableArgs? + // an optional object with additional parameters; + // the rest is passed to the base class + if(!params){ params = {}; } + this.constraints = params.constraints; + this.within = params.within; + }, + onFirstMove: function(/* dojo.dnd.Mover */ mover){ + // summary: + // called during the very first move notification; + // can be used to initialize coordinates, can be overwritten. + var c = this.constraintBox = this.constraints.call(this, mover); + c.r = c.l + c.w; + c.b = c.t + c.h; + if(this.within){ + var mb = dojo.marginBox(mover.node); + c.r -= mb.w; + c.b -= mb.h; + } + }, + onMove: function(/* dojo.dnd.Mover */ mover, /* Object */ leftTop){ + // summary: + // called during every move notification; + // should actually move the node; can be overwritten. + var c = this.constraintBox, s = mover.node.style; + s.left = (leftTop.l < c.l ? c.l : c.r < leftTop.l ? c.r : leftTop.l) + "px"; + s.top = (leftTop.t < c.t ? c.t : c.b < leftTop.t ? c.b : leftTop.t) + "px"; + } +}); + +/*===== +dojo.declare("dojo.dnd.move.__boxConstrainedMoveableArgs", [dojo.dnd.move.__constrainedMoveableArgs], { + // box: Object + // a constraint box + box: {} +}); +=====*/ + +dojo.declare("dojo.dnd.move.boxConstrainedMoveable", dojo.dnd.move.constrainedMoveable, { + // box: + // object attributes (for markup) + box: {}, + + // markup methods + markupFactory: function(params, node){ + return new dojo.dnd.move.boxConstrainedMoveable(node, params); + }, + + constructor: function(node, params){ + // summary: + // an object, which makes a node moveable + // node: Node + // a node (or node's id) to be moved + // params: dojo.dnd.move.__boxConstrainedMoveableArgs? + // an optional object with parameters + var box = params && params.box; + this.constraints = function(){ return box; }; + } +}); + +/*===== +dojo.declare("dojo.dnd.move.__parentConstrainedMoveableArgs", [dojo.dnd.move.__constrainedMoveableArgs], { + // area: String + // A parent's area to restrict the move. + // Can be "margin", "border", "padding", or "content". + area: "" +}); +=====*/ + +dojo.declare("dojo.dnd.move.parentConstrainedMoveable", dojo.dnd.move.constrainedMoveable, { + // area: + // object attributes (for markup) + area: "content", + + // markup methods + markupFactory: function(params, node){ + return new dojo.dnd.move.parentConstrainedMoveable(node, params); + }, + + constructor: function(node, params){ + // summary: + // an object, which makes a node moveable + // node: Node + // a node (or node's id) to be moved + // params: dojo.dnd.move.__parentConstrainedMoveableArgs? + // an optional object with parameters + var area = params && params.area; + this.constraints = function(){ + var n = this.node.parentNode, + s = dojo.getComputedStyle(n), + mb = dojo._getMarginBox(n, s); + if(area == "margin"){ + return mb; // Object + } + var t = dojo._getMarginExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + if(area == "border"){ + return mb; // Object + } + t = dojo._getBorderExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + if(area == "padding"){ + return mb; // Object + } + t = dojo._getPadExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + return mb; // Object + }; + } +}); + +// WARNING: below are obsolete objects, instead of custom movers use custom moveables (above) + +dojo.dnd.move.constrainedMover = function(fun, within){ + // summary: + // returns a constrained version of dojo.dnd.Mover + // description: + // this function produces n object, which will put a constraint on + // the margin box of dragged object in absolute coordinates + // fun: Function + // called on drag, and returns a constraint box + // within: Boolean + // if true, constraints the whole dragged object withtin the rectangle, + // otherwise the constraint is applied to the left-top corner + + dojo.deprecated("dojo.dnd.move.constrainedMover, use dojo.dnd.move.constrainedMoveable instead"); + var mover = function(node, e, notifier){ + dojo.dnd.Mover.call(this, node, e, notifier); + }; + dojo.extend(mover, dojo.dnd.Mover.prototype); + dojo.extend(mover, { + onMouseMove: function(e){ + // summary: event processor for onmousemove + // e: Event: mouse event + dojo.dnd.autoScroll(e); + var m = this.marginBox, c = this.constraintBox, + l = m.l + e.pageX, t = m.t + e.pageY; + l = l < c.l ? c.l : c.r < l ? c.r : l; + t = t < c.t ? c.t : c.b < t ? c.b : t; + this.host.onMove(this, {l: l, t: t}); + }, + onFirstMove: function(){ + // summary: called once to initialize things; it is meant to be called only once + dojo.dnd.Mover.prototype.onFirstMove.call(this); + var c = this.constraintBox = fun.call(this); + c.r = c.l + c.w; + c.b = c.t + c.h; + if(within){ + var mb = dojo.marginBox(this.node); + c.r -= mb.w; + c.b -= mb.h; + } + } + }); + return mover; // Object }; -dojo.dnd.move.parentConstrainedMover=function(_17,_18){ -dojo.deprecated("dojo.dnd.move.parentConstrainedMover, use dojo.dnd.move.parentConstrainedMoveable instead"); -var fun=function(){ -var n=this.node.parentNode,s=dojo.getComputedStyle(n),mb=dojo._getMarginBox(n,s); -if(_17=="margin"){ -return mb; -} -var t=dojo._getMarginExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -if(_17=="border"){ -return mb; -} -t=dojo._getBorderExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -if(_17=="padding"){ -return mb; -} -t=dojo._getPadExtents(n,s); -mb.l+=t.l,mb.t+=t.t,mb.w-=t.w,mb.h-=t.h; -return mb; + +dojo.dnd.move.boxConstrainedMover = function(box, within){ + // summary: + // a specialization of dojo.dnd.constrainedMover, which constrains to the specified box + // box: Object + // a constraint box (l, t, w, h) + // within: Boolean + // if true, constraints the whole dragged object withtin the rectangle, + // otherwise the constraint is applied to the left-top corner + + dojo.deprecated("dojo.dnd.move.boxConstrainedMover, use dojo.dnd.move.boxConstrainedMoveable instead"); + return dojo.dnd.move.constrainedMover(function(){ return box; }, within); // Object }; -return dojo.dnd.move.constrainedMover(fun,_18); + +dojo.dnd.move.parentConstrainedMover = function(area, within){ + // summary: + // a specialization of dojo.dnd.constrainedMover, which constrains to the parent node + // area: String + // "margin" to constrain within the parent's margin box, "border" for the border box, + // "padding" for the padding box, and "content" for the content box; "content" is the default value. + // within: Boolean + // if true, constraints the whole dragged object within the rectangle, + // otherwise the constraint is applied to the left-top corner + + dojo.deprecated("dojo.dnd.move.parentConstrainedMover, use dojo.dnd.move.parentConstrainedMoveable instead"); + var fun = function(){ + var n = this.node.parentNode, + s = dojo.getComputedStyle(n), + mb = dojo._getMarginBox(n, s); + if(area == "margin"){ + return mb; // Object + } + var t = dojo._getMarginExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + if(area == "border"){ + return mb; // Object + } + t = dojo._getBorderExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + if(area == "padding"){ + return mb; // Object + } + t = dojo._getPadExtents(n, s); + mb.l += t.l, mb.t += t.t, mb.w -= t.w, mb.h -= t.h; + return mb; // Object + }; + return dojo.dnd.move.constrainedMover(fun, within); // Object }; -dojo.dnd.constrainedMover=dojo.dnd.move.constrainedMover; -dojo.dnd.boxConstrainedMover=dojo.dnd.move.boxConstrainedMover; -dojo.dnd.parentConstrainedMover=dojo.dnd.move.parentConstrainedMover; + +// patching functions one level up for compatibility + +dojo.dnd.constrainedMover = dojo.dnd.move.constrainedMover; +dojo.dnd.boxConstrainedMover = dojo.dnd.move.boxConstrainedMover; +dojo.dnd.parentConstrainedMover = dojo.dnd.move.parentConstrainedMover; + } |