Changeset 491

Timestamp:

08/22/06 07:37:33

Author:

piv

Message:

ie compatibility

Files:

• qPloneTabs/trunk/skins/qPloneTabs/javascripts/behaviour.js (modified) (previous)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/controls.js (modified) (10 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/dragdrop.js (modified) (24 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/effects.js (modified) (38 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/prototype.js (modified) (35 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/qplonetabs.js (modified) (9 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/scriptaculous.js (modified) (2 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/javascripts/slider.js (modified) (5 diffs)
• qPloneTabs/trunk/skins/qPloneTabs/qplonetabs.css.dtml (modified) (1 diff)

qPloneTabs/trunk/skins/qPloneTabs/javascripts/controls.js

@@ -142 +142 @@
-      }
-     else 
- if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
- (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) 
+if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN)
+
-
-    this.changed = true;
@@ -151 +151 @@
-      this.observer = 
-        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
-  },
-
-  activate: function() {
-    this.changed = false;
-    this.hasFocus = true;
-    this.getUpdatedChoices();
-  },
-
@@ -228 +222 @@
-      return;
-    }
-
-
-
-
-
-
-
+
+
-    var lastTokenPos = this.findLastToken();
-    if (lastTokenPos != -1) {
@@ -317 +306 @@
-Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
-  initialize: function(element, update, url, options) {
-  
+       
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
@@ -460 +449 @@
-
-    this.options = Object.extend({
-      okButton: true,
-      okText: "ok",
-      cancelLink: true,
-      cancelText: "cancel",
-      savingText: "Saving...",
@@ -484 +471 @@
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
-
-
-
-
+
+
-    }, options || {});
-
@@ -552 +537 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  },
-  hasHTMLLineBreaks: function(string) {
@@ -583 +562 @@
-      text = this.getText();
-    }
-
-    var obj = this;
-    
-    if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) {
-      this.options.textarea = false;
-      var textField = document.createElement("input");
-      textField.obj = this;
-      textField.type = "text";
-      textField.name = "value";
-      textField.value = text;
-      textField.style.backgroundColor = this.options.highlightcolor;
-      textField.className = 'editor_field';
-      var size = this.options.size || this.options.cols || 0;
-      if (size != 0) textField.size = size;
-      if (this.options.submitOnBlur)
-        textField.onblur = this.onSubmit.bind(this);
-      this.editField = textField;
-    } else {
-      this.options.textarea = true;
-      var textArea = document.createElement("textarea");
-      textArea.obj = this;
-      textArea.name = "value";
-      textArea.value = this.convertHTMLLineBreaks(text);
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
-      textArea.className = 'editor_field';      
-      if (this.options.submitOnBlur)
-        textArea.onblur = this.onSubmit.bind(this);
-      this.editField = textArea;
-    }
@@ -661 +630 @@
-    this.onLoading();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
@@ -761 +723 @@
-  }
-};
-
-Ajax.InPlaceCollectionEditor = Class.create();
-Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
-Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
-  createEditField: function() {
-    if (!this.cached_selectTag) {
-      var selectTag = document.createElement("select");
-      var collection = this.options.collection || [];
-      var optionTag;
-      collection.each(function(e,i) {
-        optionTag = document.createElement("option");
-        optionTag.value = (e instanceof Array) ? e[0] : e;
-        if(this.options.value==optionTag.value) optionTag.selected = true;
-        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
-        selectTag.appendChild(optionTag);
-      }.bind(this));
-      this.cached_selectTag = selectTag;
-    }
-
-    this.editField = this.cached_selectTag;
-    if(this.options.loadTextURL) this.loadExternalText();
-    this.form.appendChild(this.editField);
-    this.options.callback = function(form, value) {
-      return "value=" + encodeURIComponent(value);
-    }
-  }
-});
-
-// Delayed observer, like Form.Element.Observer, 

qPloneTabs/trunk/skins/qPloneTabs/javascripts/dragdrop.js

@@ -1 +1 @@
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
-// See scriptaculous.js for full license.
@@ -17 +16 @@
-    var options = Object.extend({
-      greedy:     true,
-
-
+
-    }, arguments[1] || {});
-
@@ -40 +38 @@
-    this.drops.push(options);
-  },
-  
-  findDeepestChild: function(drops) {
-    deepest = drops[0];
-      
-    for (i = 1; i < drops.length; ++i)
-      if (Element.isParent(drops[i].element, deepest.element))
-        deepest = drops[i];
-    
-    return deepest;
-  },
-
-  isContained: function(element, drop) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    return (
-      (drop.element!=element) &&
@@ -69 +52 @@
-        (Element.classNames(element).detect( 
-          function(v) { return drop.accept.include(v) } ) )) &&
-oint[0], point[1]
+X, pY
-  },
-
@@ -79 +62 @@
-
-  activate: function(drop) {
+    if(this.last_active) this.deactivate(this.last_active);
-    if(drop.hoverclass)
-      Element.addClassName(drop.element, drop.hoverclass);
@@ -84 +68 @@
-  },
-
-poi
+eve
-    if(!this.drops.length) return;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    if(this.last_active) this.deactivate(this.last_active);
-    this.drops.each( function(drop) {
-      if(Droppables.isAffected(point, element, drop))
-        affected.push(drop);
-    });
-        
-    if(affected.length>0) {
-      drop = Droppables.findDeepestChild(affected);
-      Position.within(drop.element, point[0], point[1]);
-      if(drop.onHover)
-        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
-      Droppables.activate(drop);
-    }
-  },
-
@@ -108 +93 @@
-    Position.prepare();
-
-[Event.pointerX(event), Event.pointerY(event)]
+Event.pointerX(event), Event.pointerY(event)
-      if (this.last_active.onDrop) 
-        this.last_active.onDrop(element, this.last_active.element, event);
@@ -120 +105 @@
-
-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() {
-    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);
-    this.activeDraggable = null;
-  },
-  
-  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)
@@ -192 +120 @@
-      });
-  },
-  
-  _cacheObserverCallbacks: function() {
-    ['onStart','onEnd','onDrag'].each( function(eventName) {
@@ -209 +136 @@
-    var options = Object.extend({
-      handle: false,
-
-
-
+
+
-      },
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-element._revert = new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: 
+new Effect.MoveBy(element, -top_offset, -left_offset, {duration:
-      },
-
-
-
+
+
-      },
-      zindex: 1000,
-      revert: false,
-      scroll: false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
-    }, arguments[1] || {});
-
-
-
-
-
-
-
+
+
+
+
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
-    
-    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
-      options.scroll = $(options.scroll);
-
-    Element.makePositioned(this.element); // fix IE    
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  destroy: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      // abort on form elements, fixes a Firefox issue
-      var src = Event.element(event);
@@ -271 +209 @@
-        src.tagName=='INPUT' ||
-        src.tagName=='SELECT' ||
-        src.tagName=='OPTION' ||
-        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)];
-
-
-
-
+
+
+
-      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);
-    }
-    
-    if(this.options.scroll) {
-      if (this.options.scroll == window) {
-        var where = this._getWindowScroll(this.options.scroll);
-        this.originalScrollLeft = where.left;
-        this.originalScrollTop = where.top;
-      } else {
-        this.originalScrollLeft = this.options.scroll.scrollLeft;
-        this.originalScrollTop = this.options.scroll.scrollTop;
-      }
-    }
-    
-    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);
-    
-    if(this.options.scroll) {
-      this.stopScrolling();
-      
-      var p;
-      if (this.options.scroll == window) {
-        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
-      } else {
-        p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft;
-        p[1] += this.options.scroll.scrollTop;
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
-      }
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
-      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
-      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
-      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
-      this.startScrolling(speed);
-    }
-    
-    // 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;
-
@@ -367 +238 @@
-    var revert = this.options.revert;
-    if(revert && typeof revert == 'function') revert = revert(this.element);
-
-
+
-    if(revert && this.options.reverteffect) {
-      this.options.reverteffect(this.element, 
-
+
+
-    } else {
-
+
+
-    }
-
@@ -382 +254 @@
-      this.options.endeffect(this.element);
-
-
+
-    Droppables.reset();
-  },
-  
-  keyPress: function(event) {
-
-
-
-
-
+
+
+
+
+
+
+
-  endDrag: function(event) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    if(this.options.snap) {
-      if(typeof this.options.snap == 'function') {
- = this.options.snap(p[0],p[1],this
+os = this.options.snap(pos[0],pos[1]
-      } else {
+      var draggable = this;
-      if(this.options.snap instanceof Array) {
- = p.map
-this.options.snap[i])*this.options.snap[i] }.bind(this)
+os = pos.collect
+draggable.options.snap[i])*draggable.options.snap[i] }
-      } else {
- = p.map
-this.options.snap)*this.options.snap }.bind(this)
+os = pos.collect
+draggable.options.snap)*draggable.options.snap }
-      }
-    }}
-    
-    var style = this.element.style;
-    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
-
+os
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-
+os
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -513 +350 @@
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onStart: function() {
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onEnd: function() {
-    Sortable.unmark();
@@ -526 +361 @@
-
-var Sortable = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-  destroy: function(element){
-
-
-
+
+
-      Draggables.removeObserver(s.element);
-      s.droppables.each(function(d){ Droppables.remove(d) });
-      s.draggables.invoke('destroy');
-
-
-
-
-
+
+
+
-  create: function(element) {
-    element = $(element);
@@ -559 +381 @@
-      tag:         'li',       // assumes li children, override with tag: 'tagname'
-      dropOnEmpty: false,
-
-
+
-      overlap:     'vertical', // one of 'vertical', 'horizontal'
-      constraint:  'vertical', // one of 'vertical', 'horizontal', false
@@ -568 +389 @@
-      hoverclass:  null,
-      ghosting:    false,
-
-
-
-
+
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -582 +400 @@
-    var options_for_draggable = {
-      revert:      true,
-      scroll:      options.scroll,
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
@@ -610 +425 @@
-      overlap:     options.overlap,
-      containment: options.containment,
-      tree:        options.tree,
-      hoverclass:  options.hoverclass,
-
-
-
-
-
-
-
-
-
+
+
-    }
-
@@ -629 +436 @@
-    options.droppables = [];
-
+    // make it so
+
-    // drop on empty handling
-
-
+
+
+
-      options.droppables.push(element);
-    }
@@ -642 +452 @@
-        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
-      Droppables.add(e, options_for_droppable);
-      if(options.tree) e.treeNode = element;
-      options.droppables.push(e);      
-    });
-    
-    if(options.tree) {
-      (Sortable.findTreeElements(element, options) || []).each( function(e) {
-        Droppables.add(e, options_for_tree);
-        e.treeNode = element;
-        options.droppables.push(e);
-      });
-    }
-
-    // keep reference
-[element.id] = options
+.push(options)
-
-    // for onupdate
@@ -664 +465 @@
-  // return all suitable-for-sortable elements in a guaranteed order
-  findElements: function(element, options) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  },
-
-  onHover: function(element, dropon, overlap) {
-
-
-
-
-
+
-      Sortable.mark(dropon, 'before');
-      if(dropon.previousSibling != element) {
@@ -701 +504 @@
-    }
-  },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-      Sortable.options(oldParentNode).onChange(element);
-droponOptions
+Sortable.options(dropon)
-    }
-  },
@@ -763 +542 @@
-    Element.show(Sortable._marker);
-  },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-