From 1354d17270961fff662d40f90521223f8fd0d73b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 14 Aug 2012 18:59:10 +0400 Subject: update dojo to 1.7.3 --- lib/dojo/dnd/AutoSource.js | 8 + lib/dojo/dnd/AutoSource.js.uncompressed.js | 13 + lib/dojo/dnd/Avatar.js | 112 +----- lib/dojo/dnd/Avatar.js.uncompressed.js | 111 ++++++ lib/dojo/dnd/Container.js | 434 +------------------- lib/dojo/dnd/Container.js.uncompressed.js | 432 ++++++++++++++++++++ lib/dojo/dnd/Manager.js | 216 +--------- lib/dojo/dnd/Manager.js.uncompressed.js | 213 ++++++++++ lib/dojo/dnd/Moveable.js | 179 +-------- lib/dojo/dnd/Moveable.js.uncompressed.js | 173 ++++++++ lib/dojo/dnd/Mover.js | 127 +----- lib/dojo/dnd/Mover.js.uncompressed.js | 119 ++++++ lib/dojo/dnd/Selector.js | 332 +--------------- lib/dojo/dnd/Selector.js.uncompressed.js | 324 +++++++++++++++ lib/dojo/dnd/Source.js | 545 +------------------------- lib/dojo/dnd/Source.js.uncompressed.js | 513 ++++++++++++++++++++++++ lib/dojo/dnd/Target.js | 8 + lib/dojo/dnd/Target.js.uncompressed.js | 13 + lib/dojo/dnd/TimedMoveable.js | 77 +--- lib/dojo/dnd/TimedMoveable.js.uncompressed.js | 69 ++++ lib/dojo/dnd/autoscroll.js | 98 +---- lib/dojo/dnd/autoscroll.js.uncompressed.js | 118 ++++++ lib/dojo/dnd/common.js | 35 +- lib/dojo/dnd/common.js.uncompressed.js | 35 ++ lib/dojo/dnd/move.js | 160 +------- lib/dojo/dnd/move.js.uncompressed.js | 143 +++++++ 26 files changed, 2314 insertions(+), 2293 deletions(-) create mode 100644 lib/dojo/dnd/AutoSource.js create mode 100644 lib/dojo/dnd/AutoSource.js.uncompressed.js create mode 100644 lib/dojo/dnd/Avatar.js.uncompressed.js create mode 100644 lib/dojo/dnd/Container.js.uncompressed.js create mode 100644 lib/dojo/dnd/Manager.js.uncompressed.js create mode 100644 lib/dojo/dnd/Moveable.js.uncompressed.js create mode 100644 lib/dojo/dnd/Mover.js.uncompressed.js create mode 100644 lib/dojo/dnd/Selector.js.uncompressed.js create mode 100644 lib/dojo/dnd/Source.js.uncompressed.js create mode 100644 lib/dojo/dnd/Target.js create mode 100644 lib/dojo/dnd/Target.js.uncompressed.js create mode 100644 lib/dojo/dnd/TimedMoveable.js.uncompressed.js create mode 100644 lib/dojo/dnd/autoscroll.js.uncompressed.js create mode 100644 lib/dojo/dnd/common.js.uncompressed.js create mode 100644 lib/dojo/dnd/move.js.uncompressed.js (limited to 'lib/dojo/dnd') diff --git a/lib/dojo/dnd/AutoSource.js b/lib/dojo/dnd/AutoSource.js new file mode 100644 index 000000000..7e1a53f48 --- /dev/null +++ b/lib/dojo/dnd/AutoSource.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + +//>>built +define("dojo/dnd/AutoSource",["./Source"],function(_1){return dojo.declare("dojo.dnd.AutoSource",_1,{constructor:function(_2,_3){this.autoSync=true;}});}); \ No newline at end of file diff --git a/lib/dojo/dnd/AutoSource.js.uncompressed.js b/lib/dojo/dnd/AutoSource.js.uncompressed.js new file mode 100644 index 000000000..e37fa2e3a --- /dev/null +++ b/lib/dojo/dnd/AutoSource.js.uncompressed.js @@ -0,0 +1,13 @@ +define("dojo/dnd/AutoSource", [ "./Source" ], function(Source){ + /*===== Source = dojo.dnd.Source =====*/ + return dojo.declare("dojo.dnd.AutoSource", 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; + } + }); +}); diff --git a/lib/dojo/dnd/Avatar.js b/lib/dojo/dnd/Avatar.js index 8f43801b3..51003b9eb 100644 --- a/lib/dojo/dnd/Avatar.js +++ b/lib/dojo/dnd/Avatar.js @@ -4,113 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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, { - // 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(); - } -}); - -} +//>>built +define("dojo/dnd/Avatar",["../main","./common"],function(_1){_1.declare("dojo.dnd.Avatar",null,{constructor:function(_2){this.manager=_2;this.construct();},construct:function(){this.isA11y=_1.hasClass(_1.body(),"dijit_a11y");var a=_1.create("table",{"class":"dojoDndAvatar",style:{position:"absolute",zIndex:"1999",margin:"0px"}}),_3=this.manager.source,_4,b=_1.create("tbody",null,a),tr=_1.create("tr",null,b),td=_1.create("td",null,tr),_5=this.isA11y?_1.create("span",{id:"a11yIcon",innerHTML:this.manager.copy?"+":"<"},td):null,_6=_1.create("span",{innerHTML:_3.generateText?this._generateText():""},td),k=Math.min(5,this.manager.nodes.length),i=0;_1.attr(tr,{"class":"dojoDndAvatarHeader",style:{opacity:0.9}});for(;i - // 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.replaceClass(this.node, prefix + newState, prefix + this[state]); - 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._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._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}; - }; -}; - -} +//>>built +define("dojo/dnd/Container",["../main","../Evented","./common","../parser"],function(_1,_2){_1.declare("dojo.dnd.Container",_2,{skipForm:false,constructor:function(_3,_4){this.node=_1.byId(_3);if(!_4){_4={};}this.creator=_4.creator||null;this.skipForm=_4.skipForm;this.parent=_4.dropParent&&_1.byId(_4.dropParent);this.map={};this.current=null;this.containerState="";_1.addClass(this.node,"dojoDndContainer");if(!(_4&&_4._skipStartup)){this.startup();}this.events=[_1.connect(this.node,"onmouseover",this,"onMouseOver"),_1.connect(this.node,"onmouseout",this,"onMouseOut"),_1.connect(this.node,"ondragstart",this,"onSelectStart"),_1.connect(this.node,"onselectstart",this,"onSelectStart")];},creator:function(){},getItem:function(_5){return this.map[_5];},setItem:function(_6,_7){this.map[_6]=_7;},delItem:function(_8){delete this.map[_8];},forInItems:function(f,o){o=o||_1.global;var m=this.map,e=_1.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 _1.query("> .dojoDndItem",this.parent);},sync:function(){var _9={};this.getAllNodes().forEach(function(_a){if(_a.id){var _b=this.getItem(_a.id);if(_b){_9[_a.id]=_b;return;}}else{_a.id=_1.dnd.getUniqueId();}var _c=_a.getAttribute("dndType"),_d=_a.getAttribute("dndData");_9[_a.id]={data:_d||_a.innerHTML,type:_c?_c.split(/\s*,\s*/):["text"]};},this);this.map=_9;return this;},insertNodes:function(_e,_f,_10){if(!this.parent.firstChild){_10=null;}else{if(_f){if(!_10){_10=this.parent.firstChild;}}else{if(_10){_10=_10.nextSibling;}}}if(_10){for(var i=0;i<_e.length;++i){var t=this._normalizedCreator(_e[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.insertBefore(t.node,_10);}}else{for(var i=0;i<_e.length;++i){var t=this._normalizedCreator(_e[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.appendChild(t.node);}}return this;},destroy:function(){_1.forEach(this.events,_1.disconnect);this.clearItems();this.node=this.parent=this.current=null;},markupFactory:function(_11,_12,_13){_11._skipStartup=true;return new _13(_12,_11);},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=_1.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||!_1.dnd.isFormElement(e)){_1.stopEvent(e);}},onOverEvent:function(){},onOutEvent:function(){},_changeState:function(_14,_15){var _16="dojoDnd"+_14;var _17=_14.toLowerCase()+"State";_1.replaceClass(this.node,_16+_15,_16+this[_17]);this[_17]=_15;},_addItemClass:function(_18,_19){_1.addClass(_18,"dojoDndItem"+_19);},_removeItemClass:function(_1a,_1b){_1.removeClass(_1a,"dojoDndItem"+_1b);},_getChildByEvent:function(e){var _1c=e.target;if(_1c){for(var _1d=_1c.parentNode;_1d;_1c=_1d,_1d=_1c.parentNode){if(_1d==this.parent&&_1.hasClass(_1c,"dojoDndItem")){return _1c;}}}return null;},_normalizedCreator:function(_1e,_1f){var t=(this.creator||this.defaultCreator).call(this,_1e,_1f);if(!_1.isArray(t.type)){t.type=["text"];}if(!t.node.id){t.node.id=_1.dnd.getUniqueId();}_1.addClass(t.node,"dojoDndItem");return t;}});_1.dnd._createNode=function(tag){if(!tag){return _1.dnd._createSpan;}return function(_20){return _1.create(tag,{innerHTML:_20});};};_1.dnd._createTrTd=function(_21){var tr=_1.create("tr");_1.create("td",{innerHTML:_21},tr);return tr;};_1.dnd._createSpan=function(_22){return _1.create("span",{innerHTML:_22});};_1.dnd._defaultCreatorNodes={ul:"li",ol:"li",div:"div",p:"div"};_1.dnd._defaultCreator=function(_23){var tag=_23.tagName.toLowerCase();var c=tag=="tbody"||tag=="thead"?_1.dnd._createTrTd:_1.dnd._createNode(_1.dnd._defaultCreatorNodes[tag]);return function(_24,_25){var _26=_24&&_1.isObject(_24),_27,_28,n;if(_26&&_24.tagName&&_24.nodeType&&_24.getAttribute){_27=_24.getAttribute("dndData")||_24.innerHTML;_28=_24.getAttribute("dndType");_28=_28?_28.split(/\s*,\s*/):["text"];n=_24;}else{_27=(_26&&_24.data)?_24.data:_24;_28=(_26&&_24.type)?_24.type:["text"];n=(_25=="avatar"?_1.dnd._createSpan:c)(String(_27));}if(!n.id){n.id=_1.dnd.getUniqueId();}return {node:n,data:_27,type:_28};};};return _1.dnd.Container;}); \ No newline at end of file diff --git a/lib/dojo/dnd/Container.js.uncompressed.js b/lib/dojo/dnd/Container.js.uncompressed.js new file mode 100644 index 000000000..c8c4181c1 --- /dev/null +++ b/lib/dojo/dnd/Container.js.uncompressed.js @@ -0,0 +1,432 @@ +define("dojo/dnd/Container", ["../main", "../Evented", "./common", "../parser"], function(dojo, Evented) { + // module: + // dojo/dnd/Container + // summary: + // TODOC + + +/* + 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", Evented, { + // 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 + // 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, ctor){ + params._skipStartup = true; + return new ctor(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.replaceClass(this.node, prefix + newState, prefix + this[state]); + 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._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._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}; + }; +}; + +return dojo.dnd.Container; +}); diff --git a/lib/dojo/dnd/Manager.js b/lib/dojo/dnd/Manager.js index 38611fbd4..079dffa19 100644 --- a/lib/dojo/dnd/Manager.js +++ b/lib/dojo/dnd/Manager.js @@ -4,217 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -if(!dojo._hasResource["dojo.dnd.Manager"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. -dojo._hasResource["dojo.dnd.Manager"] = true; -dojo.provide("dojo.dnd.Manager"); -dojo.require("dojo.dnd.common"); -dojo.require("dojo.dnd.autoscroll"); -dojo.require("dojo.dnd.Avatar"); - - -dojo.declare("dojo.dnd.Manager", null, { - // summary: - // the manager of DnD operations (usually a singleton) - 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", "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.replaceClass(dojo.body(), - "dojoDnd" + (this.copy ? "Copy" : "Move"), - "dojoDnd" + (this.copy ? "Move" : "Copy")); - } -}); - -// 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 -}; - -} +//>>built +define("dojo/dnd/Manager",["../main","../Evented","./common","./autoscroll","./Avatar"],function(_1,_2){var _3=_1.declare("dojo.dnd.Manager",[_2],{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(_4){if(this.avatar){this.target=(_4&&_4.targetState!="Disabled")?_4:null;this.canDropFlag=Boolean(this.target);this.avatar.update();}_1.publish("/dnd/source/over",[_4]);},outSource:function(_5){if(this.avatar){if(this.target==_5){this.target=null;this.canDropFlag=false;this.avatar.update();_1.publish("/dnd/source/over",[null]);}}else{_1.publish("/dnd/source/over",[null]);}},startDrag:function(_6,_7,_8){this.source=_6;this.nodes=_7;this.copy=Boolean(_8);this.avatar=this.makeAvatar();_1.body().appendChild(this.avatar.node);_1.publish("/dnd/start",[_6,_7,this.copy]);this.events=[_1.connect(_1.doc,"onmousemove",this,"onMouseMove"),_1.connect(_1.doc,"onmouseup",this,"onMouseUp"),_1.connect(_1.doc,"onkeydown",this,"onKeyDown"),_1.connect(_1.doc,"onkeyup",this,"onKeyUp"),_1.connect(_1.doc,"ondragstart",_1.stopEvent),_1.connect(_1.body(),"onselectstart",_1.stopEvent)];var c="dojoDnd"+(_8?"Copy":"Move");_1.addClass(_1.body(),c);},canDrop:function(_9){var _a=Boolean(this.target&&_9);if(this.canDropFlag!=_a){this.canDropFlag=_a;this.avatar.update();}},stopDrag:function(){_1.removeClass(_1.body(),["dojoDndCopy","dojoDndMove"]);_1.forEach(this.events,_1.disconnect);this.events=[];this.avatar.destroy();this.avatar=null;this.source=this.target=null;this.nodes=[];},makeAvatar:function(){return new _1.dnd.Avatar(this);},updateAvatar:function(){this.avatar.update();},onMouseMove:function(e){var a=this.avatar;if(a){_1.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 _b=Boolean(this.source.copyState(_1.isCopyKey(e)));if(this.copy!=_b){this._setCopyStatus(_b);}}},onMouseUp:function(e){if(this.avatar){if(this.target&&this.canDropFlag){var _c=Boolean(this.source.copyState(_1.isCopyKey(e))),_d=[this.source,this.nodes,_c,this.target,e];_1.publish("/dnd/drop/before",_d);_1.publish("/dnd/drop",_d);}else{_1.publish("/dnd/cancel");}this.stopDrag();}},onKeyDown:function(e){if(this.avatar){switch(e.keyCode){case _1.keys.CTRL:var _e=Boolean(this.source.copyState(true));if(this.copy!=_e){this._setCopyStatus(_e);}break;case _1.keys.ESCAPE:_1.publish("/dnd/cancel");this.stopDrag();break;}}},onKeyUp:function(e){if(this.avatar&&e.keyCode==_1.keys.CTRL){var _f=Boolean(this.source.copyState(false));if(this.copy!=_f){this._setCopyStatus(_f);}}},_setCopyStatus:function(_10){this.copy=_10;this.source._markDndStatus(this.copy);this.updateAvatar();_1.replaceClass(_1.body(),"dojoDnd"+(this.copy?"Copy":"Move"),"dojoDnd"+(this.copy?"Move":"Copy"));}});_1.dnd._manager=null;_3.manager=_1.dnd.manager=function(){if(!_1.dnd._manager){_1.dnd._manager=new _1.dnd.Manager();}return _1.dnd._manager;};return _3;}); \ No newline at end of file diff --git a/lib/dojo/dnd/Manager.js.uncompressed.js b/lib/dojo/dnd/Manager.js.uncompressed.js new file mode 100644 index 000000000..916050f93 --- /dev/null +++ b/lib/dojo/dnd/Manager.js.uncompressed.js @@ -0,0 +1,213 @@ +define("dojo/dnd/Manager", ["../main", "../Evented", "./common", "./autoscroll", "./Avatar"], function(dojo, Evented) { + // module: + // dojo/dnd/Manager + // summary: + // TODOC + + +var Manager = dojo.declare("dojo.dnd.Manager", [Evented], { + // 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", "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.replaceClass(dojo.body(), + "dojoDnd" + (this.copy ? "Copy" : "Move"), + "dojoDnd" + (this.copy ? "Move" : "Copy")); + } +}); + +// dojo.dnd._manager: +// The manager singleton variable. Can be overwritten if needed. +dojo.dnd._manager = null; + +Manager.manager = 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 +}; + +return Manager; +}); diff --git a/lib/dojo/dnd/Moveable.js b/lib/dojo/dnd/Moveable.js index 705b8cf62..289b4cf94 100644 --- a/lib/dojo/dnd/Moveable.js +++ b/lib/dojo/dnd/Moveable.js @@ -4,180 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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.__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"), - dojo.connect(this.handle, "ontouchstart", 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/ontouchstart, creates a Mover for the node - // e: Event - // mouse/touch 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, "ontouchmove", this, "onMouseMove"), - dojo.connect(this.handle, "onmouseup", this, "onMouseUp"), - dojo.connect(this.handle, "ontouchend", this, "onMouseUp") - ); - var pos = e.touches ? e.touches[0] : e; - this._lastX = pos.pageX; - this._lastY = pos.pageY; - }else{ - this.onDragDetected(e); - } - dojo.stopEvent(e); - }, - onMouseMove: function(e){ - // summary: - // event processor for onmousemove/ontouchmove, used only for delayed drags - // e: Event - // mouse/touch event - var pos = e.touches ? e.touches[0] : e; - if(Math.abs(pos.pageX - this._lastX) > this.delay || Math.abs(pos.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 - } -}); - -} +//>>built +define("dojo/dnd/Moveable",["../main","../Evented","../touch","./Mover"],function(_1,_2,_3){_1.declare("dojo.dnd.Moveable",[_2],{handle:"",delay:0,skip:false,constructor:function(_4,_5){this.node=_1.byId(_4);if(!_5){_5={};}this.handle=_5.handle?_1.byId(_5.handle):null;if(!this.handle){this.handle=this.node;}this.delay=_5.delay>0?_5.delay:0;this.skip=_5.skip;this.mover=_5.mover?_5.mover:_1.dnd.Mover;this.events=[_1.connect(this.handle,_3.press,this,"onMouseDown"),_1.connect(this.handle,"ondragstart",this,"onSelectStart"),_1.connect(this.handle,"onselectstart",this,"onSelectStart")];},markupFactory:function(_6,_7,_8){return new _8(_7,_6);},destroy:function(){_1.forEach(this.events,_1.disconnect);this.events=this.node=this.handle=null;},onMouseDown:function(e){if(this.skip&&_1.dnd.isFormElement(e)){return;}if(this.delay){this.events.push(_1.connect(this.handle,_3.move,this,"onMouseMove"),_1.connect(this.handle,_3.release,this,"onMouseUp"));this._lastX=e.pageX;this._lastY=e.pageY;}else{this.onDragDetected(e);}_1.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);}_1.stopEvent(e);},onMouseUp:function(e){for(var i=0;i<2;++i){_1.disconnect(this.events.pop());}_1.stopEvent(e);},onSelectStart:function(e){if(!this.skip||!_1.dnd.isFormElement(e)){_1.stopEvent(e);}},onDragDetected:function(e){new this.mover(this.node,e,this);},onMoveStart:function(_9){_1.publish("/dnd/move/start",[_9]);_1.addClass(_1.body(),"dojoMove");_1.addClass(this.node,"dojoMoveItem");},onMoveStop:function(_a){_1.publish("/dnd/move/stop",[_a]);_1.removeClass(_1.body(),"dojoMove");_1.removeClass(this.node,"dojoMoveItem");},onFirstMove:function(_b,e){},onMove:function(_c,_d,e){this.onMoving(_c,_d);var s=_c.node.style;s.left=_d.l+"px";s.top=_d.t+"px";this.onMoved(_c,_d);},onMoving:function(_e,_f){},onMoved:function(_10,_11){}});return _1.dnd.Moveable;}); \ No newline at end of file diff --git a/lib/dojo/dnd/Moveable.js.uncompressed.js b/lib/dojo/dnd/Moveable.js.uncompressed.js new file mode 100644 index 000000000..e3a3ad8a9 --- /dev/null +++ b/lib/dojo/dnd/Moveable.js.uncompressed.js @@ -0,0 +1,173 @@ +define("dojo/dnd/Moveable", ["../main", "../Evented", "../touch", "./Mover"], function(dojo, Evented, touch) { + // module: + // dojo/dnd/Moveable + // summary: + // TODOC + + +/*===== +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", [Evented], { + // 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, touch.press, 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, ctor){ + return new ctor(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/ontouchstart, creates a Mover for the node + // e: Event + // mouse/touch event + if(this.skip && dojo.dnd.isFormElement(e)){ return; } + if(this.delay){ + this.events.push( + dojo.connect(this.handle, touch.move, this, "onMouseMove"), + dojo.connect(this.handle, touch.release, 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/ontouchmove, used only for delayed drags + // e: Event + // mouse/touch 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 + } +}); + +return dojo.dnd.Moveable; +}); diff --git a/lib/dojo/dnd/Mover.js b/lib/dojo/dnd/Mover.js index a8c161c80..fecc6d9b8 100644 --- a/lib/dojo/dnd/Mover.js +++ b/lib/dojo/dnd/Mover.js @@ -4,128 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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(node, e, host){ - // summary: - // an object which makes a node follow the mouse, or touch-drag on touch devices. - // Used as a default mover, and as a base class for custom movers. - // node: Node - // a node (or node's id) to be moved - // e: Event - // 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); - var pos = e.touches ? e.touches[0] : e; - this.marginBox = {l: pos.pageX, t: pos.pageY}; - this.mouseButton = e.button; - var h = (this.host = host), d = node.ownerDocument; - this.events = [ - // At the start of a drag, onFirstMove is called, and then the following two - // connects are disconnected - dojo.connect(d, "onmousemove", this, "onFirstMove"), - dojo.connect(d, "ontouchmove", this, "onFirstMove"), - - // These are called continually during the drag - dojo.connect(d, "onmousemove", this, "onMouseMove"), - dojo.connect(d, "ontouchmove", this, "onMouseMove"), - - // And these are called at the end of the drag - dojo.connect(d, "onmouseup", this, "onMouseUp"), - dojo.connect(d, "ontouchend", this, "onMouseUp"), - - // cancel text selection and text dragging - dojo.connect(d, "ondragstart", dojo.stopEvent), - dojo.connect(d.body, "onselectstart", dojo.stopEvent) - ]; - // notify that the move has started - if(h && h.onMoveStart){ - h.onMoveStart(this); - } - }, - // mouse event processors - onMouseMove: function(e){ - // summary: - // event processor for onmousemove/ontouchmove - // e: Event - // mouse/touch event - dojo.dnd.autoScroll(e); - var m = this.marginBox, - pos = e.touches ? e.touches[0] : e; - this.host.onMove(this, {l: m.l + pos.pageX, t: m.t + pos.pageY}, e); - dojo.stopEvent(e); - }, - onMouseUp: function(e){ - if(dojo.isWebKit && dojo.isMac && this.mouseButton == 2 ? - e.button == 0 : this.mouseButton == e.button){ // TODO Should condition be met for touch devices, too? - 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); - } - - // Disconnect onmousemove and ontouchmove events that call this function - dojo.disconnect(this.events.shift()); - dojo.disconnect(this.events.shift()); - }, - 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; - } -}); - -} +//>>built +define("dojo/dnd/Mover",["../main","../Evented","../touch","./common","./autoscroll"],function(_1,_2,_3){_1.declare("dojo.dnd.Mover",[_2],{constructor:function(_4,e,_5){this.node=_1.byId(_4);this.marginBox={l:e.pageX,t:e.pageY};this.mouseButton=e.button;var h=(this.host=_5),d=_4.ownerDocument;this.events=[_1.connect(d,_3.move,this,"onFirstMove"),_1.connect(d,_3.move,this,"onMouseMove"),_1.connect(d,_3.release,this,"onMouseUp"),_1.connect(d,"ondragstart",_1.stopEvent),_1.connect(d.body,"onselectstart",_1.stopEvent)];if(h&&h.onMoveStart){h.onMoveStart(this);}},onMouseMove:function(e){_1.dnd.autoScroll(e);var m=this.marginBox;this.host.onMove(this,{l:m.l+e.pageX,t:m.t+e.pageY},e);_1.stopEvent(e);},onMouseUp:function(e){if(_1.isWebKit&&_1.isMac&&this.mouseButton==2?e.button==0:this.mouseButton==e.button){this.destroy();}_1.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=_1.marginBox(this.node);var b=_1.doc.body;var bs=_1.getComputedStyle(b);var bm=_1._getMarginBox(b,bs);var bc=_1._getContentBox(b,bs);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);}_1.disconnect(this.events.shift());},destroy:function(){_1.forEach(this.events,_1.disconnect);var h=this.host;if(h&&h.onMoveStop){h.onMoveStop(this);}this.events=this.node=this.host=null;}});return _1.dnd.Mover;}); \ No newline at end of file diff --git a/lib/dojo/dnd/Mover.js.uncompressed.js b/lib/dojo/dnd/Mover.js.uncompressed.js new file mode 100644 index 000000000..2b504c232 --- /dev/null +++ b/lib/dojo/dnd/Mover.js.uncompressed.js @@ -0,0 +1,119 @@ +define("dojo/dnd/Mover", ["../main", "../Evented", "../touch", "./common", "./autoscroll"], function(dojo, Evented, touch) { + // module: + // dojo/dnd/Mover + // summary: + // TODOC + + +dojo.declare("dojo.dnd.Mover", [Evented], { + constructor: function(node, e, host){ + // summary: + // an object which makes a node follow the mouse, or touch-drag on touch devices. + // Used as a default mover, and as a base class for custom movers. + // node: Node + // a node (or node's id) to be moved + // e: Event + // 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; + this.events = [ + // At the start of a drag, onFirstMove is called, and then the following two + // connects are disconnected + dojo.connect(d, touch.move, this, "onFirstMove"), + + // These are called continually during the drag + dojo.connect(d, touch.move, this, "onMouseMove"), + + // And these are called at the end of the drag + dojo.connect(d, touch.release, this, "onMouseUp"), + + // cancel text selection and text dragging + dojo.connect(d, "ondragstart", dojo.stopEvent), + dojo.connect(d.body, "onselectstart", dojo.stopEvent) + ]; + // notify that the move has started + if(h && h.onMoveStart){ + h.onMoveStart(this); + } + }, + // mouse event processors + onMouseMove: function(e){ + // summary: + // event processor for onmousemove/ontouchmove + // e: Event + // mouse/touch 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){ // TODO Should condition be met for touch devices, too? + 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); + } + + // Disconnect onmousemove and ontouchmove events that call this function + dojo.disconnect(this.events.shift()); + }, + 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; + } +}); + +return dojo.dnd.Mover; +}); diff --git a/lib/dojo/dnd/Selector.js b/lib/dojo/dnd/Selector.js index 20569daae..8c1929072 100644 --- a/lib/dojo/dnd/Selector.js +++ b/lib/dojo/dnd/Selector.js @@ -4,333 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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"); - - -/* - 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 - // 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 - } -}); - -} +//>>built +define("dojo/dnd/Selector",["../main","./common","./Container"],function(_1){_1.declare("dojo.dnd.Selector",_1.dnd.Container,{constructor:function(_2,_3){if(!_3){_3={};}this.singular=_3.singular;this.autoSync=_3.autoSync;this.selection={};this.anchor=null;this.simpleSelection=false;this.events.push(_1.connect(this.node,"onmousedown",this,"onMouseDown"),_1.connect(this.node,"onmouseup",this,"onMouseUp"));},singular:false,getSelectedNodes:function(){var t=new _1.NodeList();var e=_1.dnd._empty;for(var i in this.selection){if(i in e){continue;}t.push(_1.byId(i));}return t;},selectNone:function(){return this._removeSelection()._removeAnchor();},selectAll:function(){this.forInItems(function(_4,id){this._addItemClass(_1.byId(id),"Selected");this.selection[id]=1;},this);return this._removeAnchor();},deleteSelectedNodes:function(){var e=_1.dnd._empty;for(var i in this.selection){if(i in e){continue;}var n=_1.byId(i);this.delItem(i);_1.destroy(n);}this.anchor=null;this.selection={};return this;},forInSelectedItems:function(f,o){o=o||_1.global;var s=this.selection,e=_1.dnd._empty;for(var i in s){if(i in e){continue;}f.call(o,this.getItem(i),i,this);}},sync:function(){_1.dnd.Selector.superclass.sync.call(this);if(this.anchor){if(!this.getItem(this.anchor.id)){this.anchor=null;}}var t=[],e=_1.dnd._empty;for(var i in this.selection){if(i in e){continue;}if(!this.getItem(i)){t.push(i);}}_1.forEach(t,function(i){delete this.selection[i];},this);return this;},insertNodes:function(_5,_6,_7,_8){var _9=this._normalizedCreator;this._normalizedCreator=function(_a,_b){var t=_9.call(this,_a,_b);if(_5){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;};_1.dnd.Selector.superclass.insertNodes.call(this,_6,_7,_8);this._normalizedCreator=_9;return this;},destroy:function(){_1.dnd.Selector.superclass.destroy.call(this);this.selection=this.anchor=null;},onMouseDown:function(e){if(this.autoSync){this.sync();}if(!this.current){return;}if(!this.singular&&!_1.isCopyKey(e)&&!e.shiftKey&&(this.current.id in this.selection)){this.simpleSelection=true;if(e.button===_1.mouseButtons.LEFT){_1.stopEvent(e);}return;}if(!this.singular&&e.shiftKey){if(!_1.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 + // 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; + }, + + // 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 + } +}); + +return dojo.dnd.Selector; +}); diff --git a/lib/dojo/dnd/Source.js b/lib/dojo/dnd/Source.js index 30a61becd..b61da09bd 100644 --- a/lib/dojo/dnd/Source.js +++ b/lib/dojo/dnd/Source.js @@ -4,546 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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"); - - -/* - 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); - } -}); - -} +//>>built +define("dojo/dnd/Source",["../main","./Selector","./Manager"],function(_1,_2,_3){if(!_1.isAsync){_1.ready(0,function(){var _4=["dojo/dnd/AutoSource","dojo/dnd/Target"];require(_4);});}return _1.declare("dojo.dnd.Source",_2,{isSource:true,horizontal:false,copyOnly:false,selfCopy:false,selfAccept:true,skipForm:false,withHandles:false,autoSync:false,delay:0,accept:["text"],generateText:true,constructor:function(_5,_6){_1.mixin(this,_1.mixin({},_6));var _7=this.accept;if(_7.length){this.accept={};for(var i=0;i<_7.length;++i){this.accept[_7[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){_1.addClass(this.node,"dojoDndSource");}this.targetState="";if(this.accept){_1.addClass(this.node,"dojoDndTarget");}if(this.horizontal){_1.addClass(this.node,"dojoDndHorizontal");}this.topics=[_1.subscribe("/dnd/source/over",this,"onDndSourceOver"),_1.subscribe("/dnd/start",this,"onDndStart"),_1.subscribe("/dnd/drop",this,"onDndDrop"),_1.subscribe("/dnd/cancel",this,"onDndCancel")];},checkAcceptance:function(_8,_9){if(this==_8){return !this.copyOnly||this.selfAccept;}for(var i=0;i<_9.length;++i){var _a=_8.getItem(_9[i].id).type;var _b=false;for(var j=0;j<_a.length;++j){if(_a[j] in this.accept){_b=true;break;}}if(!_b){return false;}}return true;},copyState:function(_c,_d){if(_c){return true;}if(arguments.length<2){_d=this==_3.manager().target;}if(_d){if(this.copyOnly){return this.selfCopy;}}else{return this.copyOnly;}return false;},destroy:function(){_1.dnd.Source.superclass.destroy.call(this);_1.forEach(this.topics,_1.unsubscribe);this.targetAnchor=null;},onMouseMove:function(e){if(this.isDragging&&this.targetState=="Disabled"){return;}_1.dnd.Source.superclass.onMouseMove.call(this,e);var m=_3.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 _e=this.getSelectedNodes();if(_e.length){m.startDrag(this,_e,this.copyState(_1.isCopyKey(e),true));}}}if(this.isDragging){var _f=false;if(this.current){if(!this.targetBox||this.targetAnchor!=this.current){this.targetBox=_1.position(this.current,true);}if(this.horizontal){_f=(e.pageX-this.targetBox.x)<(this.targetBox.w/2);}else{_f=(e.pageY-this.targetBox.y)<(this.targetBox.h/2);}}if(this.current!=this.targetAnchor||_f!=this.before){this._markTargetAnchor(_f);m.canDrop(!this.current||m.source!=this||!(this.current.id in this.selection));}}},onMouseDown:function(e){if(!this.mouseDown&&this._legalMouseDown(e)&&(!this.skipForm||!_1.dnd.isFormElement(e))){this.mouseDown=true;this._lastX=e.pageX;this._lastY=e.pageY;_1.dnd.Source.superclass.onMouseDown.call(this,e);}},onMouseUp:function(e){if(this.mouseDown){this.mouseDown=false;_1.dnd.Source.superclass.onMouseUp.call(this,e);}},onDndSourceOver:function(_10){if(this!=_10){this.mouseDown=false;if(this.targetAnchor){this._unmarkTargetAnchor();}}else{if(this.isDragging){var m=_3.manager();m.canDrop(this.targetState!="Disabled"&&(!this.current||m.source!=this||!(this.current.id in this.selection)));}}},onDndStart:function(_11,_12,_13){if(this.autoSync){this.sync();}if(this.isSource){this._changeState("Source",this==_11?(_13?"Copied":"Moved"):"");}var _14=this.accept&&this.checkAcceptance(_11,_12);this._changeState("Target",_14?"":"Disabled");if(this==_11){_3.manager().overSource(this);}this.isDragging=true;},onDndDrop:function(_15,_16,_17,_18){if(this==_18){this.onDrop(_15,_16,_17);}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(_19,_1a,_1b){if(this!=_19){this.onDropExternal(_19,_1a,_1b);}else{this.onDropInternal(_1a,_1b);}},onDropExternal:function(_1c,_1d,_1e){var _1f=this._normalizedCreator;if(this.creator){this._normalizedCreator=function(_20,_21){return _1f.call(this,_1c.getItem(_20.id).data,_21);};}else{if(_1e){this._normalizedCreator=function(_22,_23){var t=_1c.getItem(_22.id);var n=_22.cloneNode(true);n.id=_1.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}else{this._normalizedCreator=function(_24,_25){var t=_1c.getItem(_24.id);_1c.delItem(_24.id);return {node:_24,data:t.data,type:t.type};};}}this.selectNone();if(!_1e&&!this.creator){_1c.selectNone();}this.insertNodes(true,_1d,this.before,this.current);if(!_1e&&this.creator){_1c.deleteSelectedNodes();}this._normalizedCreator=_1f;},onDropInternal:function(_26,_27){var _28=this._normalizedCreator;if(this.current&&this.current.id in this.selection){return;}if(_27){if(this.creator){this._normalizedCreator=function(_29,_2a){return _28.call(this,this.getItem(_29.id).data,_2a);};}else{this._normalizedCreator=function(_2b,_2c){var t=this.getItem(_2b.id);var n=_2b.cloneNode(true);n.id=_1.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}}else{if(!this.current){return;}this._normalizedCreator=function(_2d,_2e){var t=this.getItem(_2d.id);return {node:_2d,data:t.data,type:t.type};};}this._removeSelection();this.insertNodes(true,_26,this.before,this.current);this._normalizedCreator=_28;},onDraggingOver:function(){},onDraggingOut:function(){},onOverEvent:function(){_1.dnd.Source.superclass.onOverEvent.call(this);_3.manager().overSource(this);if(this.isDragging&&this.targetState!="Disabled"){this.onDraggingOver();}},onOutEvent:function(){_1.dnd.Source.superclass.onOutEvent.call(this);_3.manager().outSource(this);if(this.isDragging&&this.targetState!="Disabled"){this.onDraggingOut();}},_markTargetAnchor:function(_2f){if(this.current==this.targetAnchor&&this.before==_2f){return;}if(this.targetAnchor){this._removeItemClass(this.targetAnchor,this.before?"Before":"After");}this.targetAnchor=this.current;this.targetBox=null;this.before=_2f;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(_30){this._changeState("Source",_30?"Copied":"Moved");},_legalMouseDown:function(e){if(!_1.mouseButtons.isLeft(e)){return false;}if(!this.withHandles){return true;}for(var _31=e.target;_31&&_31!==this.node;_31=_31.parentNode){if(_1.hasClass(_31,"dojoDndHandle")){return true;}if(_1.hasClass(_31,"dojoDndItem")||_1.hasClass(_31,"dojoDndIgnore")){break;}}return false;}});}); \ No newline at end of file diff --git a/lib/dojo/dnd/Source.js.uncompressed.js b/lib/dojo/dnd/Source.js.uncompressed.js new file mode 100644 index 000000000..55eabf04e --- /dev/null +++ b/lib/dojo/dnd/Source.js.uncompressed.js @@ -0,0 +1,513 @@ +define("dojo/dnd/Source", ["../main", "./Selector", "./Manager"], function(dojo, Selector, Manager) { + // module: + // dojo/dnd/Source + // summary: + // TODOC + +/*===== +Selector = dojo.dnd.Selector; +=====*/ + +/* + 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; +} +=====*/ + +// For back-compat, remove in 2.0. +if(!dojo.isAsync){ + dojo.ready(0, function(){ + var requires = ["dojo/dnd/AutoSource", "dojo/dnd/Target"]; + require(requires); // use indirection so modules not rolled into a build + }) +} + +return dojo.declare("dojo.dnd.Source", 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 == Manager.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; + }, + + // 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 = Manager.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 = Manager.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){ + Manager.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); + Manager.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); + Manager.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 + } +}); + +}); diff --git a/lib/dojo/dnd/Target.js b/lib/dojo/dnd/Target.js new file mode 100644 index 000000000..cd10fbc27 --- /dev/null +++ b/lib/dojo/dnd/Target.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + +//>>built +define("dojo/dnd/Target",["./Source"],function(_1){return dojo.declare("dojo.dnd.Target",_1,{constructor:function(_2,_3){this.isSource=false;dojo.removeClass(this.node,"dojoDndSource");}});}); \ No newline at end of file diff --git a/lib/dojo/dnd/Target.js.uncompressed.js b/lib/dojo/dnd/Target.js.uncompressed.js new file mode 100644 index 000000000..bed2dcc09 --- /dev/null +++ b/lib/dojo/dnd/Target.js.uncompressed.js @@ -0,0 +1,13 @@ +define("dojo/dnd/Target", [ "./Source" ], function(Source){ + /*===== Source = dojo.dnd.Source =====*/ + return dojo.declare("dojo.dnd.Target", 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"); + } + }); +}); diff --git a/lib/dojo/dnd/TimedMoveable.js b/lib/dojo/dnd/TimedMoveable.js index bd8e7d253..049ee5da1 100644 --- a/lib/dojo/dnd/TimedMoveable.js +++ b/lib/dojo/dnd/TimedMoveable.js @@ -4,78 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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(){ - // 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); - } - } - }); -})(); - -} +//>>built +define("dojo/dnd/TimedMoveable",["../main","./Moveable"],function(_1){var _2=_1.dnd.Moveable.prototype.onMove;_1.declare("dojo.dnd.TimedMoveable",_1.dnd.Moveable,{timeout:40,constructor:function(_3,_4){if(!_4){_4={};}if(_4.timeout&&typeof _4.timeout=="number"&&_4.timeout>=0){this.timeout=_4.timeout;}},onMoveStop:function(_5){if(_5._timer){clearTimeout(_5._timer);_2.call(this,_5,_5._leftTop);}_1.dnd.Moveable.prototype.onMoveStop.apply(this,arguments);},onMove:function(_6,_7){_6._leftTop=_7;if(!_6._timer){var _8=this;_6._timer=setTimeout(function(){_6._timer=null;_2.call(_8,_6,_6._leftTop);},this.timeout);}}});return _1.dnd.TimedMoveable;}); \ No newline at end of file diff --git a/lib/dojo/dnd/TimedMoveable.js.uncompressed.js b/lib/dojo/dnd/TimedMoveable.js.uncompressed.js new file mode 100644 index 000000000..66bcdd2e3 --- /dev/null +++ b/lib/dojo/dnd/TimedMoveable.js.uncompressed.js @@ -0,0 +1,69 @@ +define("dojo/dnd/TimedMoveable", ["../main", "./Moveable"], function(dojo) { + // module: + // dojo/dnd/TimedMoveable + // summary: + // TODOC + + /*===== + 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 + }); + =====*/ + + // 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; + } + }, + + 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); + } + } + }); + + return dojo.dnd.TimedMoveable; + +}); diff --git a/lib/dojo/dnd/autoscroll.js b/lib/dojo/dnd/autoscroll.js index d2c99cf30..3d3a57b30 100644 --- a/lib/dojo/dnd/autoscroll.js +++ b/lib/dojo/dnd/autoscroll.js @@ -4,99 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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.require("dojo.window"); - -dojo.getObject("dnd", true, dojo); - -dojo.dnd.getViewport = dojo.window.getBox; - -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.window.getBox(), 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){ - // 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); -}; - -} +//>>built +define("dojo/dnd/autoscroll",["../main","../window"],function(_1){_1.getObject("dnd",true,_1);_1.dnd.getViewport=_1.window.getBox;_1.dnd.V_TRIGGER_AUTOSCROLL=32;_1.dnd.H_TRIGGER_AUTOSCROLL=32;_1.dnd.V_AUTOSCROLL_VALUE=16;_1.dnd.H_AUTOSCROLL_VALUE=16;_1.dnd.autoScroll=function(e){var v=_1.window.getBox(),dx=0,dy=0;if(e.clientX<_1.dnd.H_TRIGGER_AUTOSCROLL){dx=-_1.dnd.H_AUTOSCROLL_VALUE;}else{if(e.clientX>v.w-_1.dnd.H_TRIGGER_AUTOSCROLL){dx=_1.dnd.H_AUTOSCROLL_VALUE;}}if(e.clientY<_1.dnd.V_TRIGGER_AUTOSCROLL){dy=-_1.dnd.V_AUTOSCROLL_VALUE;}else{if(e.clientY>v.h-_1.dnd.V_TRIGGER_AUTOSCROLL){dy=_1.dnd.V_AUTOSCROLL_VALUE;}}window.scrollBy(dx,dy);};_1.dnd._validNodes={"div":1,"p":1,"td":1};_1.dnd._validOverflow={"auto":1,"scroll":1};_1.dnd.autoScrollNodes=function(e){var b,t,w,h,rx,ry,dx=0,dy=0,_2,_3;for(var n=e.target;n;){if(n.nodeType==1&&(n.tagName.toLowerCase() in _1.dnd._validNodes)){var s=_1.getComputedStyle(n),_4=(s.overflow.toLowerCase() in _1.dnd._validOverflow),_5=(s.overflowX.toLowerCase() in _1.dnd._validOverflow),_6=(s.overflowY.toLowerCase() in _1.dnd._validOverflow);if(_4||_5||_6){b=_1._getContentBox(n,s);t=_1.position(n,true);}if(_4||_5){w=Math.min(_1.dnd.H_TRIGGER_AUTOSCROLL,b.w/2);rx=e.pageX-t.x;if(_1.isWebKit||_1.isOpera){rx+=_1.body().scrollLeft;}dx=0;if(rx>0&&rxb.w-w){dx=w;}}_2=n.scrollLeft;n.scrollLeft=n.scrollLeft+dx;}}if(_4||_6){h=Math.min(_1.dnd.V_TRIGGER_AUTOSCROLL,b.h/2);ry=e.pageY-t.y;if(_1.isWebKit||_1.isOpera){ry+=_1.body().scrollTop;}dy=0;if(ry>0&&ryb.h-h){dy=h;}}_3=n.scrollTop;n.scrollTop=n.scrollTop+dy;}}if(dx||dy){return;}}try{n=n.parentNode;}catch(x){n=null;}}_1.dnd.autoScroll(e);};return _1.dnd;}); \ No newline at end of file diff --git a/lib/dojo/dnd/autoscroll.js.uncompressed.js b/lib/dojo/dnd/autoscroll.js.uncompressed.js new file mode 100644 index 000000000..2fbeca2ec --- /dev/null +++ b/lib/dojo/dnd/autoscroll.js.uncompressed.js @@ -0,0 +1,118 @@ +define("dojo/dnd/autoscroll", ["../main", "../window"], function(dojo) { + // module: + // dojo/dnd/autoscroll + // summary: + // TODOC + +dojo.getObject("dnd", true, dojo); + +dojo.dnd.getViewport = dojo.window.getBox; + +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.window.getBox(), 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){ + // 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! + + var b, t, w, h, rx, ry, dx = 0, dy = 0, oldLeft, oldTop; + + for(var n = e.target; n;){ + if(n.nodeType == 1 && (n.tagName.toLowerCase() in dojo.dnd._validNodes)){ + var s = dojo.getComputedStyle(n), + overflow = (s.overflow.toLowerCase() in dojo.dnd._validOverflow), + overflowX = (s.overflowX.toLowerCase() in dojo.dnd._validOverflow), + overflowY = (s.overflowY.toLowerCase() in dojo.dnd._validOverflow); + if(overflow || overflowX || overflowY){ + b = dojo._getContentBox(n, s); + t = dojo.position(n, true); + } + // overflow-x + if(overflow || overflowX){ + w = Math.min(dojo.dnd.H_TRIGGER_AUTOSCROLL, b.w / 2); + rx = e.pageX - t.x; + 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; + } + dx = 0; + if(rx > 0 && rx < b.w){ + if(rx < w){ + dx = -w; + }else if(rx > b.w - w){ + dx = w; + } + oldLeft = n.scrollLeft; + n.scrollLeft = n.scrollLeft + dx; + } + } + // overflow-y + if(overflow || overflowY){ + //console.log(b.l, b.t, t.x, t.y, n.scrollLeft, n.scrollTop); + h = Math.min(dojo.dnd.V_TRIGGER_AUTOSCROLL, b.h / 2); + ry = e.pageY - t.y; + 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 + ry += dojo.body().scrollTop; + } + dy = 0; + if(ry > 0 && ry < b.h){ + if(ry < h){ + dy = -h; + }else if(ry > b.h - h){ + dy = h; + } + oldTop = n.scrollTop; + n.scrollTop = n.scrollTop + dy; + } + } + if(dx || dy){ return; } + } + try{ + n = n.parentNode; + }catch(x){ + n = null; + } + } + dojo.dnd.autoScroll(e); +}; + + return dojo.dnd; +}); diff --git a/lib/dojo/dnd/common.js b/lib/dojo/dnd/common.js index f69aa5a5a..97434a728 100644 --- a/lib/dojo/dnd/common.js +++ b/lib/dojo/dnd/common.js @@ -4,36 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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.getObject("dnd", true, dojo); - -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(/*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 -}; - -} +//>>built +define("dojo/dnd/common",["../main"],function(_1){_1.getObject("dnd",true,_1);_1.dnd.getCopyKeyState=_1.isCopyKey;_1.dnd._uniqueId=0;_1.dnd.getUniqueId=function(){var id;do{id=_1._scopeName+"Unique"+(++_1.dnd._uniqueId);}while(_1.byId(id));return id;};_1.dnd._empty={};_1.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;};return _1.dnd;}); \ No newline at end of file diff --git a/lib/dojo/dnd/common.js.uncompressed.js b/lib/dojo/dnd/common.js.uncompressed.js new file mode 100644 index 000000000..ec56449ae --- /dev/null +++ b/lib/dojo/dnd/common.js.uncompressed.js @@ -0,0 +1,35 @@ +define("dojo/dnd/common", ["../main"], function(dojo) { + // module: + // dojo/dnd/common + // summary: + // TODOC + +dojo.getObject("dnd", true, dojo); + +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(/*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 +}; + +return dojo.dnd; +}); diff --git a/lib/dojo/dnd/move.js b/lib/dojo/dnd/move.js index 6a737bd3a..3c8d97ae0 100644 --- a/lib/dojo/dnd/move.js +++ b/lib/dojo/dnd/move.js @@ -4,161 +4,5 @@ see: http://dojotoolkit.org/license for details */ - -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.__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._getMarginSize(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; - this.onMoving(mover, leftTop); - leftTop.l = leftTop.l < c.l ? c.l : c.r < leftTop.l ? c.r : leftTop.l; - leftTop.t = leftTop.t < c.t ? c.t : c.b < leftTop.t ? c.b : leftTop.t; - s.left = leftTop.l + "px"; - s.top = leftTop.t + "px"; - this.onMoved(mover, leftTop); - } -}); - -/*===== -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 - }; - } -}); - -// 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; - -} +//>>built +define("dojo/dnd/move",["../main","./Mover","./Moveable"],function(_1){_1.declare("dojo.dnd.move.constrainedMoveable",_1.dnd.Moveable,{constraints:function(){},within:false,constructor:function(_2,_3){if(!_3){_3={};}this.constraints=_3.constraints;this.within=_3.within;},onFirstMove:function(_4){var c=this.constraintBox=this.constraints.call(this,_4);c.r=c.l+c.w;c.b=c.t+c.h;if(this.within){var mb=_1._getMarginSize(_4.node);c.r-=mb.w;c.b-=mb.h;}},onMove:function(_5,_6){var c=this.constraintBox,s=_5.node.style;this.onMoving(_5,_6);_6.l=_6.l