X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..f5240829880f87e0cf581c6a296e436fdef0ef80:/src/dd/DDCore.js?ds=inline diff --git a/src/dd/DDCore.js b/src/dd/DDCore.js index a2d2c622..0775b99e 100644 --- a/src/dd/DDCore.js +++ b/src/dd/DDCore.js @@ -1,6 +1,6 @@ /*! - * Ext JS Library 3.0.0 - * Copyright(c) 2006-2009 Ext JS, LLC + * Ext JS Library 3.3.0 + * Copyright(c) 2006-2010 Ext JS, Inc. * licensing@extjs.com * http://www.extjs.com/license */ @@ -96,7 +96,7 @@ Ext.dd.DragDrop.prototype = { /** * The id of the element that will be dragged. By default this is same - * as the linked element , but could be changed to another element. Ex: + * as the linked element, but could be changed to another element. Ex: * Ext.dd.DDProxy * @property dragElId * @type String @@ -187,7 +187,9 @@ Ext.dd.DragDrop.prototype = { * Lock this instance * @method lock */ - lock: function() { this.locked = true; }, + lock: function() { + this.locked = true; + }, /** * When set to true, other DD objects in cooperating DDGroups do not receive @@ -201,7 +203,9 @@ Ext.dd.DragDrop.prototype = { * Unlock this instace * @method unlock */ - unlock: function() { this.locked = false; }, + unlock: function() { + this.locked = false; + }, /** * By default, all instances can be a drop target. This can be disabled by @@ -269,7 +273,6 @@ Ext.dd.DragDrop.prototype = { * The up constraint * @property minY * @type int - * @type int * @private */ minY: 0, @@ -321,7 +324,7 @@ Ext.dd.DragDrop.prototype = { primaryButtonOnly: true, /** - * The availabe property is false until the linked dom element is accessible. + * The available property is false until the linked dom element is accessible. * @property available * @type boolean */ @@ -519,24 +522,25 @@ Ext.dd.DragDrop.prototype = { * @param {Boolean} inContent (optional) Constrain the draggable in the content box of the element (inside padding and borders) */ constrainTo : function(constrainTo, pad, inContent){ - if(typeof pad == "number"){ + if(Ext.isNumber(pad)){ pad = {left: pad, right:pad, top:pad, bottom:pad}; } pad = pad || this.defaultPadding; - var b = Ext.get(this.getEl()).getBox(); - var ce = Ext.get(constrainTo); - var s = ce.getScroll(); - var c, cd = ce.dom; + var b = Ext.get(this.getEl()).getBox(), + ce = Ext.get(constrainTo), + s = ce.getScroll(), + c, + cd = ce.dom; if(cd == document.body){ c = { x: s.left, y: s.top, width: Ext.lib.Dom.getViewWidth(), height: Ext.lib.Dom.getViewHeight()}; }else{ var xy = ce.getXY(); - c = {x : xy[0]+s.left, y: xy[1]+s.top, width: cd.clientWidth, height: cd.clientHeight}; + c = {x : xy[0], y: xy[1], width: cd.clientWidth, height: cd.clientHeight}; } - var topSpace = b.y - c.y; - var leftSpace = b.x - c.x; + var topSpace = b.y - c.y, + leftSpace = b.x - c.x; this.resetConstraints(); this.setXConstraint(leftSpace - (pad.left||0), // left @@ -711,7 +715,6 @@ Ext.dd.DragDrop.prototype = { this.lastPageX = p[0]; this.lastPageY = p[1]; - this.setStartPosition(p); }, @@ -853,7 +856,6 @@ Ext.dd.DragDrop.prototype = { // set the initial element position this.setStartPosition(); - this.b4MouseDown(e); this.onMouseDown(e); @@ -1104,8 +1106,6 @@ Ext.dd.DragDrop.prototype = { * @param {boolean} maintainOffset */ resetConstraints: function() { - - // Maintain offsets if necessary if (this.initPageX || this.initPageX === 0) { // figure out how much this thing has moved @@ -1143,7 +1143,6 @@ Ext.dd.DragDrop.prototype = { * @private */ getTick: function(val, tickArray) { - if (!tickArray) { // If tick interval is not defined, it is effectively 1 pixel, // so we return the value passed to us. @@ -1180,7 +1179,7 @@ Ext.dd.DragDrop.prototype = { }; })(); -/** +/* * The drag and drop utility provides a framework for building drag and drop * applications. In addition to enabling drag and drop for specific elements, * the drag and drop elements are tracked by the manager class, and the @@ -1211,7 +1210,7 @@ Ext.dd.DragDropMgr = function() { * dimension is the DragDrop item group, the second the DragDrop * object. * @property ids - * @type {string: string} + * @type String[] * @private * @static */ @@ -1222,7 +1221,7 @@ Ext.dd.DragDropMgr = function() { * if the element that generated the mousedown event is actually the * handle and not the html element itself. * @property handleIds - * @type {string: string} + * @type String[] * @private * @static */ @@ -1436,7 +1435,7 @@ Ext.dd.DragDropMgr = function() { /** * The number of milliseconds after the mousedown event to initiate the - * drag if we don't get a mouseup event. Default=1000 + * drag if we don't get a mouseup event. Default=350 * @property clickTimeThresh * @type int * @static @@ -1592,8 +1591,8 @@ Ext.dd.DragDropMgr = function() { * Returns true if the specified dd target is a legal target for * the specifice drag obj * @method isLegalTarget - * @param {DragDrop} the drag obj - * @param {DragDrop} the target + * @param {DragDrop} oDD the drag obj + * @param {DragDrop} oTargetDD the target * @return {boolean} true if the target is a legal target for the * dd obj * @static @@ -1665,7 +1664,7 @@ Ext.dd.DragDropMgr = function() { */ handleMouseDown: function(e, oDD) { if(Ext.QuickTips){ - Ext.QuickTips.disable(); + Ext.QuickTips.ddDisable(); } if(this.dragCurrent){ // the original browser mouseup wasn't handled (e.g. outside FF browser window) @@ -1723,7 +1722,7 @@ Ext.dd.DragDropMgr = function() { handleMouseUp: function(e) { if(Ext.QuickTips){ - Ext.QuickTips.enable(); + Ext.QuickTips.ddEnable(); } if (! this.dragCurrent) { return; @@ -2267,7 +2266,7 @@ Ext.dd.DragDropMgr = function() { /** * Inner class for cached elements - * @class DragDropMgr.ElementWrapper + * @class Ext.dd.DragDropMgr.ElementWrapper * @for DragDropMgr * @private * @deprecated @@ -2380,7 +2379,9 @@ Ext.dd.DragDropMgr = function() { * @return {int} the document's scrollTop * @static */ - getScrollTop: function () { return this.getScroll().top; }, + getScrollTop: function () { + return this.getScroll().top; + }, /** * Gets the scrollLeft @@ -2388,7 +2389,9 @@ Ext.dd.DragDropMgr = function() { * @return {int} the document's scrollTop * @static */ - getScrollLeft: function () { return this.getScroll().left; }, + getScrollLeft: function () { + return this.getScroll().left; + }, /** * Sets the x/y position of an element to the location of the @@ -2408,7 +2411,9 @@ Ext.dd.DragDropMgr = function() { * @method numericSort * @static */ - numericSort: function(a, b) { return (a - b); }, + numericSort: function(a, b) { + return (a - b); + }, /** * Internal counter @@ -2683,8 +2688,6 @@ Ext.extend(Ext.dd.DD, Ext.dd.DragDrop, { * @private */ getTargetCoord: function(iPageX, iPageY) { - - var x = iPageX - this.deltaX; var y = iPageY - this.deltaY; @@ -2986,7 +2989,170 @@ Ext.dd.DDTarget = function(id, sGroup, config) { // Ext.dd.DDTarget.prototype = new Ext.dd.DragDrop(); Ext.extend(Ext.dd.DDTarget, Ext.dd.DragDrop, { + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + getDragEl: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + isValidHandleChild: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + startDrag: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + endDrag: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onDrag: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onDragDrop: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onDragEnter: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onDragOut: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onDragOver: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onInvalidDrop: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onMouseDown: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + onMouseUp: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setXConstraint: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setYConstraint: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + resetConstraints: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + clearConstraints: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + clearTicks: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setInitPosition: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setDragElId: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setHandleElId: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + setOuterHandleElId: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + addInvalidHandleClass: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + addInvalidHandleId: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + addInvalidHandleType: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + removeInvalidHandleClass: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + removeInvalidHandleId: Ext.emptyFn, + /** + * @hide + * Overridden and disabled. A DDTarget does not support being dragged. + * @method + */ + removeInvalidHandleType: Ext.emptyFn, + toString: function() { return ("DDTarget " + this.id); } -}); +}); \ No newline at end of file