radiant 0.6.3 → 0.6.4

data/public/javascripts/ruledtable.js

@@ -1,28 +1,13 @@
-var RuledTable = Class.create();
-RuledTable.prototype = {
-  
-  initialize: function(element_id) {
-    var table = $(element_id);
-    var rows = table.getElementsByTagName('tr');
-    for (var i = 0; i < rows.length; i++) {
-      this.setupRow(rows[i]);
-    }
-  },
-  
-  onMouseOverRow: function(event) {
-    // Element.addClassName(this, 'highlight');
-    this.className = this.className.replace(/\s*\bhighlight\b|$/, ' highlight'); // faster than the above
+var RuledTable = Class.create({
+  initialize: function(element) {
+    if (Prototype.Browser.IE)
+      $(element).
+        observe('mouseover', this.onMouseOverRow.bindAsEventListener(this, 'addClassName')).
+        observe('mouseout', this.onMouseOverRow.bindAsEventListener(this, 'removeClassName'));
   },
   
-  onMouseOutRow: function(event) {
-    // Element.removeClassName(this, 'highlight');
-    this.className = this.className.replace(/\s*\bhighlight\b\s*/, ' '); // faster than the above
-  },
-  
-  setupRow: function(row) {
-    Event.observe(row, 'mouseover', this.onMouseOverRow.bindAsEventListener(row));
-    Event.observe(row, 'mouseout', this.onMouseOutRow.bindAsEventListener(row));
-    if (this.onRowSetup) this.onRowSetup(row);
+  onMouseOverRow: function(event, method) {
+    var row = event.findElement('tr');
+    if (row) row[method]('highlight');
   }
-  
-};
+});

data/public/javascripts/sitemap.js

@@ -1,43 +1,33 @@
-var SiteMap = Class.create();
-SiteMap.prototype = Object.extend({}, RuledTable.prototype); // Inherit from RuledTable
-
-Object.extend(SiteMap.prototype, {
-
-  ruledTableInitialize: RuledTable.prototype.initialize,
-  
-  initialize: function(id, expanded) {
-    this.ruledTableInitialize(id);
-    this.expandedRows = expanded
-  },
-  
-  onRowSetup: function(row) {
-    Event.observe(row, 'click', this.onMouseClickRow.bindAsEventListener(this), false);
+var SiteMap = Class.create(RuledTable, {
+  initialize: function($super, element) {
+    $super(element);
+    this.readExpandedCookie();
+    Event.observe(element, 'click', this.onMouseClickRow.bindAsEventListener(this));
   },
   
   onMouseClickRow: function(event) {
-    var element = Event.element(event);
-    if (this.isExpander(element)) {
-      var row = Event.findElement(event, 'tr');
+    if (this.isExpander(event.target)) {
+      var row = event.findElement('tr');
       if (this.hasChildren(row)) {
-        this.toggleBranch(row, element);
+        this.toggleBranch(row, event.target);
       }
     }
   },
   
   hasChildren: function(row) {
-    return ! /\bno-children\b/.test(row.className);
+    return !row.hasClassName('no-children');
   },
   
   isExpander: function(element) {
-    return (element.tagName.strip().downcase() == 'img') && /\bexpander\b/i.test(element.className);
+    return element.match('img.expander');
   },
   
   isExpanded: function(row) {
-    return /\bchildren-visible\b/i.test(row.className);
+    return row.hasClassName('children-visible');
   },
   
   isRow: function(element) {
-    return element.tagName && (element.tagName.strip().downcase() == 'tr');
+    return element && element.tagName && element.match('tr');
   },
   
   extractLevel: function(row) {
@@ -51,119 +41,91 @@ Object.extend(SiteMap.prototype, {
   },
   
   getExpanderImageForRow: function(row) {
-    var images = $A(row.getElementsByTagName('img', row));
-    var expanders = [];
-    images.each(function(image){
-      expanders.push(image);
-    }.bind(this));
-    return expanders.first();
-  },     
+    return row.down('img');
+  },
   
+  readExpandedCookie: function() {
+    var matches = document.cookie.match(/expanded_rows=(.+?);/);
+    this.expandedRows = matches ? matches[1].split(',') : [];
+  },
+
   saveExpandedCookie: function() {
     document.cookie = "expanded_rows=" + this.expandedRows.uniq().join(",") + "; path=/admin";
   }, 
-  
-  hideBranch: function(row, img) {
-    var level = this.extractLevel(row);
-    var sibling = row.nextSibling;
-    while(sibling != null) {
-      if (this.isRow(sibling)) {
-        if (this.extractLevel(sibling) <= level) break;
-        Element.hide(sibling);
-      }
-      sibling = sibling.nextSibling;
-    }
+
+  persistCollapsed: function(row) {
     var pageId = this.extractPageId(row);
-    var newExpanded = [];
-    for(i = 0; i < this.expandedRows.length; i++)
-      if(this.expandedRows[i] != pageId)
-        newExpanded.push(this.expandedRows[i]);
-    this.expandedRows = newExpanded;
+    this.expandedRows = this.expandedRows.without(pageId);
+    this.saveExpandedCookie();
+  },
+
+  persistExpanded: function(row) {
+    this.expandedRows.push(this.extractPageId(row));
     this.saveExpandedCookie();
-    if (img == null)
-      img = this.getExpanderImageForRow(row);
-    img.src = img.src.replace(/collapse/, 'expand');
-    Element.removeClassName(row, 'children-visible');
-    Element.addClassName(row, 'children-hidden');
+  },
+
+  toggleExpanded: function(row, img) {
+    if (!img) img = this.getExpanderImageForRow(row);
+    if (this.isExpanded(row)) {
+      img.src = img.src.replace('collapse', 'expand');
+      row.removeClassName('children-visible');
+      row.addClassName('children-hidden');
+      this.persistCollapsed(row);
+    } else {
+      img.src = img.src.replace('expand', 'collapse');
+      row.removeClassName('children-hidden');
+      row.addClassName('children-visible');
+      this.persistExpanded(row);
+    }
   },
   
-  showBranchInternal: function(row, img) {
-    var level = this.extractLevel(row);
-    var sibling = row.nextSibling;
-    var children = false;
-    var childOwningSiblings = [];        
-    while(sibling != null) {
-      if (this.isRow(sibling)) {
-        var siblingLevel = this.extractLevel(sibling);
-        if (siblingLevel <= level) break;
-        if (siblingLevel == level + 1) {
-          Element.show(sibling);
-          if(sibling.className.match(/children-visible/)) {
-            childOwningSiblings.push(sibling);
-          } else {
-            this.hideBranch(sibling);
-          }
-        }
-        children = true;
-      }
-      sibling = sibling.nextSibling;
+  hideBranch: function(parent, img) {
+    var level = this.extractLevel(parent), row = parent.next();
+    while (this.isRow(row) && this.extractLevel(row) > level) {
+      row.hide();
+      row = row.next();
     }
-    if (!children)
-      this.getBranch(row);
-    if (img == null)
-      img = this.getExpanderImageForRow(row);          
-    img.src = img.src.replace(/expand/, 'collapse');
-    for(i=0; i < childOwningSiblings.length; i++) {
-        this.showBranch(childOwningSiblings[i], null);            
-    }        
-    Element.removeClassName(row, 'children-hidden');
-    Element.addClassName(row, 'children-visible');
+    this.toggleExpanded(parent, img);
   },
   
-  showBranch: function(row, img) {
-    this.showBranchInternal(row, img);
-    this.expandedRows.push(this.extractPageId(row));
-    this.saveExpandedCookie();
+  showBranch: function(parent, img) {
+    var level = this.extractLevel(parent), row = parent.next(),
+        children = false, expandLevels = [level + 1];
+        
+    while (this.isRow(row)) {
+      var currentLevel = this.extractLevel(row);
+      if (currentLevel <= level) break;
+      children = true;
+      if (currentLevel < expandLevels.last()) expandLevels.pop();
+      if (expandLevels.include(currentLevel)) {
+        row.show();
+        if (this.isExpanded(row)) expandLevels.push(currentLevel + 1);
+      }
+      row = row.next();
+    }
+    if (!children) this.getBranch(parent);
+    this.toggleExpanded(parent, img);
   },
   
   getBranch: function(row) {
-    var level = this.extractLevel(row).toString();
-    var id = this.extractPageId(row).toString();
+    var id = this.extractPageId(row), level = this.extractLevel(row),
+        spinner = $('busy-' + id);
+        
     new Ajax.Updater(
       row,
       '../admin/ui/pages/children/' + id + '/' + level,
       {
-        asynchronous: true,
-        insertion: Insertion.After,
-        onLoading: function(request) {
-          Element.show('busy-' + id);
-          this.updating = true;
-        }.bind(this),
-        onComplete: function(request) {
-          var sibling = row.nextSibling;
-          while (sibling != null) {
-            if (this.isRow(sibling)) {
-              var siblingLevel = this.extractLevel(sibling);
-              if (siblingLevel <= level) break;
-              this.setupRow(sibling);
-            }
-            sibling = sibling.nextSibling;
-          }
-          this.updating = false;
-          Effect.Fade('busy-' + id);
-        }.bind(this)
+        insertion: "after",
+        onLoading:  function() { spinner.show(); this.updating = true  }.bind(this),
+        onComplete: function() { spinner.fade(); this.updating = false }.bind(this)
       }
     );
   },
   
   toggleBranch: function(row, img) {
-    if (! this.updating) {
-      if (this.isExpanded(row)) {
-        this.hideBranch(row, img);
-      } else {
-        this.showBranch(row, img);
-      }
+    if (!this.updating) {
+      var method = (this.isExpanded(row) ? 'hide' : 'show') + 'Branch';
+      this[method](row, img);
     }
   }
-
 });

data/public/javascripts/string.js

@@ -1,5 +1,4 @@
 Object.extend(String.prototype, {
-
   upcase: function() {
     return this.toUpperCase();
   },
@@ -8,10 +7,6 @@ Object.extend(String.prototype, {
     return this.toLowerCase();
   },
   
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-  
   toInteger: function() {
     return parseInt(this);
   },
@@ -19,5 +14,4 @@ Object.extend(String.prototype, {
   toSlug: function() {
     return this.strip().downcase().replace(/[^-a-z0-9~\s\.:;+=_]/g, '').replace(/[\s\.:;=+]+/g, '-');
   }
-
-});
+});

data/public/javascripts/tabcontrol.js

@@ -1,19 +1,14 @@
-var TabControl = Class.create();
-
-TabControl.controls = $H();
-TabControl.BadTabError = new Error('TabControl: Invalid tab.');
-
-TabControl.prototype = {
+var TabControl = Class.create({
   /*
     Initializes a tab control. The variable +element_id+ must be the id of an HTML element
     containing one element with it's class name set to 'tabs' and another element with it's
     class name set to 'pages'.
   */
-  initialize: function(element_id) {
-    TabControl.controls[element_id] = this;
-    this.control_id = element_id;
-    this.element = $(element_id);
-    this.tab_container = document.getElementsByClassName('tabs', this.element).first();
+  initialize: function(element) {
+    this.element = $(element);
+    this.control_id = this.element.identify();
+    TabControl.controls.set(this.control_id, this);
+    this.tab_container = this.element.down('.tabs');
     this.tabs = $H();
   },
   
@@ -24,37 +19,24 @@ TabControl.prototype = {
     itself. When a tab is initially added the page element is hidden.
   */
   addTab: function(tab_id, caption, page) {
-    new Insertion.Bottom(
-      this.tab_container,
-      '<a class="tab" href="javascript:TabControl.controls[\''
-      + this.control_id
-      + '\'].select(\'' + tab_id + '\');">' + caption + '</a>'
-    );
-    var tab = this.tab_container.lastChild;
-    tab.tab_id = tab_id;
-    tab.caption = caption;
-    tab.page = $(page);
-    this.tabs[tab_id] = tab;
-    this._setNotHere(tab);
-    return tab;
+    var tab = new TabControl.Tab(this, tab_id, caption, page);
+    
+    this.tabs.set(tab.id, tab);
+    return this.tab_container.appendChild(tab.createElement());
   },
   
   /*
     Removes +tab+. The variable +tab+ may be either a tab ID or a tab element.
   */
   removeTab: function(tab) {
-    var t = this._tabify(tab);
-    var id = t.tab_id;
-    Element.remove(t.page);
-    Element.remove(t);
-    new_tabs = $H();
-    this.tabs.each(function(pair) {
-      if (pair.key != id) new_tabs[pair.key] = pair.value;
-    });
-    this.tabs = new_tabs;
-    if (this.selected.tab_id == id) {
+    if (Object.isString(tab)) tab = this.tabs.get(tab);
+    tab.remove();
+    this.tabs.unset(tab);
+    
+    if (this.selected == tab) {
       var first = this.firstTab();
-      if (typeof first != 'undefined') this.select(first.tab_id);
+      if (first) this.select(first);
+      else this.selected = null;
     }
   },
 
@@ -63,32 +45,26 @@ TabControl.prototype = {
     tab element.
   */
   select: function(tab) {
-    var t = this._tabify(tab);
-    this.tabs.each(function(pair) {
-      if (pair.key == t.tab_id) {
-        if (this.selected) this.selected.selected = false;
-        this.selected = t;
-        t.selected = true;
-        this._setHere(pair.key);
-      } else {
-        this._setNotHere(pair.key);
-      }
-    }.bind(this));
-    false;
+    if (Object.isString(tab)) tab = this.tabs.get(tab);
+    if (this.selected) this.selected.unselect();
+    tab.select();
+    this.selected = tab;
+    var persist = this.pageId() + ':' + this.selected.id;
+    document.cookie = "current_tab=" + persist + "; path=/admin";
   },
 
   /*
     Returns the first tab element that was added using #addTab().
   */
   firstTab: function() {
-    return this.tabs[this.tabs.keys().first()];
+    return this.tabs.get(this.tabs.keys().first());
   },
   
   /*
     Returns the the last tab element that was added using #addTab().
   */
   lastTab: function() {
-    return this.tabs[this.tabs.keys().last()];
+    return this.tabs.get(this.tabs.keys().last());
   },
   
   /*
@@ -97,44 +73,53 @@ TabControl.prototype = {
   tabCount: function() {
     return this.tabs.keys().length;
   },
-  
-  /*
-    Private Methods
-  */
-  
-  /*
-    Shows the page for +tab+ and adds the class 'here' to tab. The variable +tab+ may
-    be either a tab ID or a tab element.
-  */
-  _setHere: function(tab) {
-    var t = this._tabify(tab);
-    Element.show(t.page);
-    Element.addClassName(t, 'here');
+
+  autoSelect: function() {
+    var tab, matches = document.cookie.match(/current_tab=(.+?);/);
+    if (matches) {
+      matches = matches[1].split(':');
+      var page = matches[0], tabId = matches[1];
+      if (!page || page == this.pageId()) tab = this.tabs.get(tabId);
+    }
+    this.select(tab || this.firstTab());
   },
-  
-  /*
-    Hides the page for +tab+ and removes the class 'here' from tab. The variable +tab+
-    may be either a tab ID or a tab element.
-  */
-  _setNotHere: function(tab) {
-    var t = this._tabify(tab);
-    Element.hide(t.page);
-    Element.removeClassName(t, 'here');
+
+  pageId: function() {
+    return /(\d+)/.test(window.location.pathname) ? RegExp.$1 : '';
+  }
+});
+
+TabControl.controls = $H();
+
+TabControl.Tab = Class.create({
+  initialize: function(control, id, label, content) {
+    this.content = $(content).hide();
+    this.label   = label || id;
+    this.id      = id;
+    this.control = control;
   },
 
-  /*
-    Returns a tab when passed a string or tab element. Throws a BadTabError otherwise.
-  */
-  _tabify: function(something) {
-    if (typeof something == 'string') {
-      var object = this.tabs[something];
-    } else {
-      var object = something;
-    }
-    if ((typeof object != 'undefined') && (object.tab_id)) {
-      return object;
-    } else {
-      throw TabControl.BadTabError;
-    }
+  createElement: function() {
+    return this.element = new Element('a', { className: 'tab', href: '#' }).
+      update("<span>" + this.label + "</span>").
+      observe('click', function(event){
+        this.control.select(this.id);
+        event.stop();
+      }.bindAsEventListener(this));
+  },
+
+  select: function() {
+    this.content.show();
+    this.element.addClassName('here');
+  },
+
+  unselect: function() {
+    this.content.hide();
+    this.element.removeClassName('here');
+  },
+
+  remove: function() {
+    this.content.remove();
+    this.element.stopObserving('click').remove();
   }
-};
+});