From f7e39c4ec78e81c4336a1ef470f3ff0a2430fc7a Mon Sep 17 00:00:00 2001 From: Thomas Fuchs Date: Mon, 12 Dec 2005 17:14:05 +0000 Subject: Update to script.aculo.us 1.5.0_rc6 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3285 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/html/javascripts/dragdrop.js | 309 +++++++++++++++++++--------------- 1 file changed, 177 insertions(+), 132 deletions(-) (limited to 'railties/html/javascripts/dragdrop.js') diff --git a/railties/html/javascripts/dragdrop.js b/railties/html/javascripts/dragdrop.js index 326700782e..92d1f73162 100644 --- a/railties/html/javascripts/dragdrop.js +++ b/railties/html/javascripts/dragdrop.js @@ -8,7 +8,7 @@ var Droppables = { drops: [], remove: function(element) { - this.drops = this.drops.reject(function(d) { return d.element==element }); + this.drops = this.drops.reject(function(d) { return d.element==$(element) }); }, add: function(element) { @@ -43,7 +43,7 @@ var Droppables = { return drop._containers.detect(function(c) { return parentNode == c }); }, - isAffected: function(pX, pY, element, drop) { + isAffected: function(point, element, drop) { return ( (drop.element!=element) && ((!drop._containers) || @@ -51,7 +51,7 @@ var Droppables = { ((!drop.accept) || (Element.classNames(element).detect( function(v) { return drop.accept.include(v) } ) )) && - Position.within(drop.element, pX, pY) ); + Position.within(drop.element, point[0], point[1]) ); }, deactivate: function(drop) { @@ -61,38 +61,32 @@ var Droppables = { }, activate: function(drop) { - if(this.last_active) this.deactivate(this.last_active); if(drop.hoverclass) Element.addClassName(drop.element, drop.hoverclass); this.last_active = drop; }, - show: function(event, element) { + show: function(point, element) { if(!this.drops.length) return; - var pX = Event.pointerX(event); - var pY = Event.pointerY(event); - Position.prepare(); - - var i = this.drops.length-1; do { - var drop = this.drops[i]; - if(this.isAffected(pX, pY, element, drop)) { + + if(this.last_active) this.deactivate(this.last_active); + this.drops.each( function(drop) { + if(Droppables.isAffected(point, element, drop)) { if(drop.onHover) drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); if(drop.greedy) { - this.activate(drop); - return; + Droppables.activate(drop); + throw $break; } } - } while (i--); - - if(this.last_active) this.deactivate(this.last_active); + }); }, fire: function(event, element) { if(!this.last_active) return; Position.prepare(); - if (this.isAffected(Event.pointerX(event), Event.pointerY(event), element, this.last_active)) + if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) if (this.last_active.onDrop) this.last_active.onDrop(element, this.last_active.element, event); }, @@ -104,21 +98,78 @@ var Droppables = { } var Draggables = { + drags: [], observers: [], + + register: function(draggable) { + if(this.drags.length == 0) { + this.eventMouseUp = this.endDrag.bindAsEventListener(this); + this.eventMouseMove = this.updateDrag.bindAsEventListener(this); + this.eventKeypress = this.keyPress.bindAsEventListener(this); + + Event.observe(document, "mouseup", this.eventMouseUp); + Event.observe(document, "mousemove", this.eventMouseMove); + Event.observe(document, "keypress", this.eventKeypress); + } + this.drags.push(draggable); + }, + + unregister: function(draggable) { + this.drags = this.drags.reject(function(d) { return d==draggable }); + if(this.drags.length == 0) { + Event.stopObserving(document, "mouseup", this.eventMouseUp); + Event.stopObserving(document, "mousemove", this.eventMouseMove); + Event.stopObserving(document, "keypress", this.eventKeypress); + } + }, + + activate: function(draggable) { + window.focus(); // allows keypress events if window isn't currently focused, fails for Safari + this.activeDraggable = draggable; + }, + + deactivate: function(draggbale) { + this.activeDraggable = null; + }, + + updateDrag: function(event) { + if(!this.activeDraggable) return; + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + // Mozilla-based browsers fire successive mousemove events with + // the same coordinates, prevent needless redrawing (moz bug?) + if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; + this._lastPointer = pointer; + this.activeDraggable.updateDrag(event, pointer); + }, + + endDrag: function(event) { + if(!this.activeDraggable) return; + this._lastPointer = null; + this.activeDraggable.endDrag(event); + }, + + keyPress: function(event) { + if(this.activeDraggable) + this.activeDraggable.keyPress(event); + }, + addObserver: function(observer) { this.observers.push(observer); this._cacheObserverCallbacks(); }, + removeObserver: function(element) { // element instead of observer fixes mem leaks this.observers = this.observers.reject( function(o) { return o.element==element }); this._cacheObserverCallbacks(); }, + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' if(this[eventName+'Count'] > 0) this.observers.each( function(o) { if(o[eventName]) o[eventName](eventName, draggable, event); }); }, + _cacheObserverCallbacks: function() { ['onStart','onEnd','onDrag'].each( function(eventName) { Draggables[eventName+'Count'] = Draggables.observers.select( @@ -140,68 +191,48 @@ Draggable.prototype = { }, reverteffect: function(element, top_offset, left_offset) { var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02; - new Effect.MoveBy(element, -top_offset, -left_offset, {duration:dur}); + element._revert = new Effect.MoveBy(element, -top_offset, -left_offset, {duration:dur}); }, endeffect: function(element) { - new Effect.Opacity(element, {duration:0.2, from:0.7, to:1.0}); + new Effect.Opacity(element, {duration:0.2, from:0.7, to:1.0}); }, zindex: 1000, - revert: false + revert: false, + snap: false // false, or xy or [x,y] or function(x,y){ return [x,y] } }, arguments[1] || {}); - this.element = $(element); + this.element = $(element); + if(options.handle && (typeof options.handle == 'string')) - this.handle = Element.childrenWithClassName(this.element, options.handle)[0]; - + this.handle = Element.childrenWithClassName(this.element, options.handle)[0]; if(!this.handle) this.handle = $(options.handle); if(!this.handle) this.handle = this.element; Element.makePositioned(this.element); // fix IE - this.offsetX = 0; - this.offsetY = 0; - this.originalLeft = this.currentLeft(); - this.originalTop = this.currentTop(); - this.originalX = this.element.offsetLeft; - this.originalY = this.element.offsetTop; - - this.options = options; - - this.active = false; - this.dragging = false; + this.delta = this.currentDelta(); + this.options = options; + this.dragging = false; - this.eventMouseDown = this.startDrag.bindAsEventListener(this); - this.eventMouseUp = this.endDrag.bindAsEventListener(this); - this.eventMouseMove = this.update.bindAsEventListener(this); - this.eventKeypress = this.keyPress.bindAsEventListener(this); + this.eventMouseDown = this.initDrag.bindAsEventListener(this); + Event.observe(this.handle, "mousedown", this.eventMouseDown); - this.registerEvents(); + Draggables.register(this); }, + destroy: function() { Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); - this.unregisterEvents(); - }, - registerEvents: function() { - Event.observe(document, "mouseup", this.eventMouseUp); - Event.observe(document, "mousemove", this.eventMouseMove); - Event.observe(document, "keypress", this.eventKeypress); - Event.observe(this.handle, "mousedown", this.eventMouseDown); - }, - unregisterEvents: function() { - //if(!this.active) return; - //Event.stopObserving(document, "mouseup", this.eventMouseUp); - //Event.stopObserving(document, "mousemove", this.eventMouseMove); - //Event.stopObserving(document, "keypress", this.eventKeypress); + Draggables.unregister(this); }, - currentLeft: function() { - return parseInt(this.element.style.left || '0'); + + currentDelta: function() { + return([ + parseInt(this.element.style.left || '0'), + parseInt(this.element.style.top || '0')]); }, - currentTop: function() { - return parseInt(this.element.style.top || '0') - }, - startDrag: function(event) { - if(Event.isLeftClick(event)) { - + + initDrag: function(event) { + if(Event.isLeftClick(event)) { // abort on form elements, fixes a Firefox issue var src = Event.element(event); if(src.tagName && ( @@ -209,20 +240,53 @@ Draggable.prototype = { src.tagName=='SELECT' || src.tagName=='BUTTON' || src.tagName=='TEXTAREA')) return; + + if(this.element._revert) { + this.element._revert.cancel(); + this.element._revert = null; + } - // this.registerEvents(); - this.active = true; var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var offsets = Position.cumulativeOffset(this.element); - this.offsetX = (pointer[0] - offsets[0]); - this.offsetY = (pointer[1] - offsets[1]); + var pos = Position.cumulativeOffset(this.element); + this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); + + Draggables.activate(this); Event.stop(event); } }, + + startDrag: function(event) { + this.dragging = true; + + if(this.options.zindex) { + this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); + this.element.style.zIndex = this.options.zindex; + } + + if(this.options.ghosting) { + this._clone = this.element.cloneNode(true); + Position.absolutize(this.element); + this.element.parentNode.insertBefore(this._clone, this.element); + } + + Draggables.notify('onStart', this, event); + if(this.options.starteffect) this.options.starteffect(this.element); + }, + + updateDrag: function(event, pointer) { + if(!this.dragging) this.startDrag(event); + Position.prepare(); + Droppables.show(pointer, this.element); + Draggables.notify('onDrag', this, event); + this.draw(pointer); + if(this.options.change) this.options.change(this); + + // fix AppleWebKit rendering + if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); + Event.stop(event); + }, + finishDrag: function(event, success) { - // this.unregisterEvents(); - - this.active = false; this.dragging = false; if(this.options.ghosting) { @@ -236,14 +300,13 @@ Draggable.prototype = { var revert = this.options.revert; if(revert && typeof revert == 'function') revert = revert(this.element); - + + var d = this.currentDelta(); if(revert && this.options.reverteffect) { this.options.reverteffect(this.element, - this.currentTop()-this.originalTop, - this.currentLeft()-this.originalLeft); + d[1]-this.delta[1], d[0]-this.delta[0]); } else { - this.originalLeft = this.currentLeft(); - this.originalTop = this.currentTop(); + this.delta = d; } if(this.options.zindex) @@ -252,71 +315,48 @@ Draggable.prototype = { if(this.options.endeffect) this.options.endeffect(this.element); - + Draggables.deactivate(this); Droppables.reset(); }, + keyPress: function(event) { - if(this.active) { - if(event.keyCode==Event.KEY_ESC) { - this.finishDrag(event, false); - Event.stop(event); - } - } + if(!event.keyCode==Event.KEY_ESC) return; + this.finishDrag(event, false); + Event.stop(event); }, + endDrag: function(event) { - if(this.active && this.dragging) { - this.finishDrag(event, true); - Event.stop(event); - } - this.active = false; - this.dragging = false; - }, - draw: function(event) { - var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var offsets = Position.cumulativeOffset(this.element); - offsets[0] -= this.currentLeft(); - offsets[1] -= this.currentTop(); + if(!this.dragging) return; + this.finishDrag(event, true); + Event.stop(event); + }, + + draw: function(point) { + var pos = Position.cumulativeOffset(this.element); + var d = this.currentDelta(); + pos[0] -= d[0]; pos[1] -= d[1]; + + var p = [0,1].map(function(i){ return (point[i]-pos[i]-this.offset[i]) }.bind(this)); + + if(this.options.snap) { + if(typeof this.options.snap == 'function') { + p = this.options.snap(p[0],p[1]); + } else { + if(this.options.snap instanceof Array) { + p = p.map( function(v, i) { + return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this)) + } else { + p = p.map( function(v) { + return Math.round(v/this.options.snap)*this.options.snap }.bind(this)) + } + }} + var style = this.element.style; if((!this.options.constraint) || (this.options.constraint=='horizontal')) - style.left = (pointer[0] - offsets[0] - this.offsetX) + "px"; + style.left = p[0] + "px"; if((!this.options.constraint) || (this.options.constraint=='vertical')) - style.top = (pointer[1] - offsets[1] - this.offsetY) + "px"; + style.top = p[1] + "px"; if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering - }, - update: function(event) { - if(this.active) { - if(!this.dragging) { - var style = this.element.style; - this.dragging = true; - - if(Element.getStyle(this.element,'position')=='') - style.position = "relative"; - - if(this.options.zindex) { - this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); - style.zIndex = this.options.zindex; - } - - if(this.options.ghosting) { - this._clone = this.element.cloneNode(true); - Position.absolutize(this.element); - this.element.parentNode.insertBefore(this._clone, this.element); - } - - Draggables.notify('onStart', this, event); - if(this.options.starteffect) this.options.starteffect(this.element); - } - - Droppables.show(event, this.element); - Draggables.notify('onDrag', this, event); - this.draw(event); - if(this.options.change) this.options.change(this); - - // fix AppleWebKit rendering - if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); - - Event.stop(event); - } } } @@ -329,9 +369,11 @@ SortableObserver.prototype = { this.observer = observer; this.lastValue = Sortable.serialize(this.element); }, + onStart: function() { this.lastValue = Sortable.serialize(this.element); }, + onEnd: function() { Sortable.unmark(); if(this.lastValue != Sortable.serialize(this.element)) @@ -341,10 +383,12 @@ SortableObserver.prototype = { var Sortable = { sortables: new Array(), + options: function(element){ element = $(element); return this.sortables.detect(function(s) { return s.element == element }); }, + destroy: function(element){ element = $(element); this.sortables.findAll(function(s) { return s.element == element }).each(function(s){ @@ -354,6 +398,7 @@ var Sortable = { }); this.sortables = this.sortables.reject(function(s) { return s.element == element }); }, + create: function(element) { element = $(element); var options = Object.extend({ @@ -447,7 +492,7 @@ var Sortable = { if(!element.hasChildNodes()) return null; var elements = []; $A(element.childNodes).each( function(e) { - if(e.tagName && e.tagName==options.tag.toUpperCase() && + if(e.tagName && e.tagName.toUpperCase()==options.tag.toUpperCase() && (!options.only || (Element.hasClassName(e, options.only)))) elements.push(e); if(options.tree) { @@ -531,7 +576,7 @@ var Sortable = { name: element.id, format: sortableOptions.format || /^[^_]*_(.*)$/ }, arguments[1] || {}); - return $(this.findElements(element, options) || []).collect( function(item) { + return $(this.findElements(element, options) || []).map( function(item) { return (encodeURIComponent(options.name) + "[]=" + encodeURIComponent(item.id.match(options.format) ? item.id.match(options.format)[1] : '')); }).join("&"); -- cgit v1.2.3