Changeset 28

Timestamp:

04/17/06 10:29:54 (2 years ago)

Author:

jk

Message:

rails 1.1.1

Files:

• trunk/demo/config/boot.rb (modified) (1 diff)
• trunk/demo/public/javascripts/application.js (added)
• trunk/demo/public/javascripts/controls.js (modified) (10 diffs)
• trunk/demo/public/javascripts/dragdrop.js (modified) (27 diffs)
• trunk/demo/public/javascripts/effects.js (modified) (42 diffs)
• trunk/demo/public/javascripts/prototype.js (modified) (29 diffs)

trunk/demo/config/boot.rb

@@ -3 +3 @@
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+
-  unless RUBY_PLATFORM =~ /mswin32/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
+
-  RAILS_ROOT = root_path
-end
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
-
-Rails::Initializer.run(:set_load_path)

trunk/demo/public/javascripts/controls.js

@@ -142 +142 @@
-      }
-     else 
-if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN)
-
+ if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+ (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) 
-
-    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();
-  },
-
@@ -222 +228 @@
-      return;
-    }
-
-
+
+
+
+
+
+
+
-    var lastTokenPos = this.findLastToken();
-    if (lastTokenPos != -1) {
@@ -306 +317 @@
-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);
@@ -449 +460 @@
-
-    this.options = Object.extend({
+      okButton: true,
-      okText: "ok",
+      cancelLink: true,
-      cancelText: "cancel",
-      savingText: "Saving...",
@@ -471 +484 @@
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
-
-
+
+
+
+
-    }, options || {});
-
@@ -537 +552 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  },
-  hasHTMLLineBreaks: function(string) {
@@ -562 +583 @@
-      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;
-    }
@@ -630 +661 @@
-    this.onLoading();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
@@ -723 +761 @@
-  }
-};
+
+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, 

trunk/demo/public/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.
@@ -16 +17 @@
-    var options = Object.extend({
-      greedy:     true,
-
+
+
-    }, arguments[1] || {});
-
@@ -38 +40 @@
-    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) {
-
-
-
-
+
+
+
+
+
+
+
+
+
-  isAffected: function(point, element, drop) {
-    return (
@@ -69 +86 @@
-  show: function(point, element) {
-    if(!this.drops.length) return;
+    var affected = [];
-    
-    if(this.last_active) this.deactivate(this.last_active);
-    this.drops.each( function(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);
+    }
-  },
-
@@ -129 +150 @@
-  },
-  
-draggbale
+
-    this.activeDraggable = null;
-  },
@@ -147 +168 @@
-    this._lastPointer = null;
-    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
-  },
-  
@@ -192 +214 @@
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-By(element, -top_offset, -left_offset, {duration:
+(element, { x: -left_offset, y: -top_offset, duration: 
-      },
-      endeffect: function(element) { 
@@ -199 +221 @@
-      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] || {});
@@ -204 +229 @@
-    this.element = $(element);
-    
-
-
+
+
+
+
-    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    
@@ -228 +258 @@
-  currentDelta: function() {
-    return([
-this.element.style.left
-this.element.style.top
+Element.getStyle(this.element,'left')
+Element.getStyle(this.element,'top')
-  },
-  
@@ -239 +269 @@
-        src.tagName=='INPUT' ||
-        src.tagName=='SELECT' ||
+        src.tagName=='OPTION' ||
-        src.tagName=='BUTTON' ||
-        src.tagName=='TEXTAREA')) return;
@@ -268 +299 @@
-      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;
+      }
-    }
-    
@@ -282 +324 @@
-    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);
-  },
@@ -321 +385 @@
-  
-  keyPress: function(event) {
-!event.keyCode=
+event.keyCode!
-    this.finishDrag(event, false);
-    Event.stop(event);
@@ -328 +392 @@
-  endDrag: function(event) {
-    if(!this.dragging) return;
+    this.stopScrolling();
-    this.finishDrag(event, true);
-    Event.stop(event);
@@ -337 +402 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+
+
+
+
+
+
+
+
-    
-    if(this.options.snap) {
@@ -358 +430 @@
-      style.top  = p[1] + "px";
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+  
+  startScrolling: function(speed) {
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+  
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+    
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+    Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+    Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+    if (Draggables._lastScrollPointer[0] < 0)
+      Draggables._lastScrollPointer[0] = 0;
+    if (Draggables._lastScrollPointer[1] < 0)
+      Draggables._lastScrollPointer[1] = 0;
+    this.draw(Draggables._lastScrollPointer);
+    
+    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
-  }
-}
@@ -383 +524 @@
-
-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);
@@ -406 +557 @@
-      tag:         'li',       // assumes li children, override with tag: 'tagname'
-      dropOnEmpty: false,
-
+
+
-      overlap:     'vertical', // one of 'vertical', 'horizontal'
-      constraint:  'vertical', // one of 'vertical', 'horizontal', false
@@ -414 +566 @@
-      hoverclass:  null,
-      ghosting:    false,
-
+
+
+
+
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -425 +580 @@
-    var options_for_draggable = {
-      revert:      true,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
@@ -450 +608 @@
-      overlap:     options.overlap,
-      containment: options.containment,
+      tree:        options.tree,
-      hoverclass:  options.hoverclass,
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -461 +627 @@
-    options.droppables = [];
-
-    // make it so
-
-    // drop on empty handling
-
-
-
+
+
-      options.droppables.push(element);
-    }
@@ -477 +640 @@
-        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
-.push(options)
+[element.id] = options
-
-    // for onupdate
@@ -490 +662 @@
-  // 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) {
@@ -529 +699 @@
-    }
-  },
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      Sortable.options(oldParentNode).onChange(element);
-Sortable.options(dropon)
+droponOptions
-    }
-  },
@@ -567 +761 @@
-    Element.show(Sortable._marker);
-  },
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    element = $(element);
-    var sortableOptions = this.options(element);
-    var options = Object.extend({
-
+
+
-      only: sortableOptions.only,
-      name: element.id,
- || /^[^_]*_(.*)$/
+
-    }, arguments[1] || {});
+    
+    var root = {
+      id: null,
+      parent: null,
+      children: new Array,
+      container: element,
+      position: 0
+    }
+    
+    return Sortable._tree (element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || {});
+    
-    return $(this.findElements(element, options) || []).map( function(item) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
+
+/* Returns true if child is contained within element */
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+
+  if (child.parentNode == element) return true;
+
+  return Element.isParent(child.parentNode, element);
+}
+
+Element.findChildren = function(element, only, recursive, tagName) {    
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+}
+
+Element.offsetSize = function (element, type) {
+  if (type == 'vertical' || type == 'height')
+    return element.offsetHeight;
+  else
+    return element.offsetWidth;
+}

trunk/demo/public/javascripts/effects.js

@@ -7 +7 @@
-// See scriptaculous.js for full license.  
-
-/* ------------- element ext -------------- */  
- 
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
@@ -23 +21 @@
-  }  
-  return(color.length==7 ? color : (arguments[0] || this));  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
-  
+
-}
-
@@ -76 +70 @@
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
-                 'alpha(opacity='+value*100+')' });  
-   
+
-}  
- 
@@ -83 +77 @@
-}  
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Array.prototype.call = function() {
@@ -130 +139 @@
-      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
-    });
+  },
+  PAIRS: {
+    'slide':  ['SlideDown','SlideUp'],
+    'blind':  ['BlindDown','BlindUp'],
+    'appear': ['Appear','Fade']
+  },
+  toggle: function(element, effect) {
+    element = $(element);
+    effect = (effect || 'appear').toLowerCase();
+    var options = Object.extend({
+      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
+    }, arguments[2] || {});
+    Effect[element.visible() ? 
+      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
-};
@@ -167 +190 @@
-/* ------------- core effects ------------- */
-
-
-
+
+
+
+
+
+
-  _each: function(iterator) {
-    this.effects._each(iterator);
-  },
-  interval: null,
-  add: function(effect) {
-    var timestamp = new Date().getTime();
-    
-
+
+
+
+
-      case 'front':
-        // move unstarted effects after this effect  
@@ -192 +221 @@
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
+
+
+
+
-    if(!this.interval) 
-      this.interval = setInterval(this.loop.bind(this), 40);
@@ -207 +239 @@
-    this.effects.invoke('loop', timePos);
-  }
-
-
+
+
+
+
+
+
+
+