radiantcms-couchrest_model 0.1.4 → 0.1.5

data/public/javascripts/admin/ruledtable.js

@@ -1,13 +1,13 @@
-var RuledTableBehavior = Behavior.create({
-  initialize: function() {
+var RuledTable = Class.create({
+  initialize: function(element) {
     if (Prototype.Browser.IE)
-      this.element.
+      $(element).
         observe('mouseover', this.onMouseOverRow.bindAsEventListener(this, 'addClassName')).
         observe('mouseout', this.onMouseOverRow.bindAsEventListener(this, 'removeClassName'));
   },
   
   onMouseOverRow: function(event, method) {
     var row = event.findElement('tr');
-    if (row) row[method]('hover');
+    if (row) row[method]('highlight');
   }
-});
+});

data/public/javascripts/admin/sitemap.js

@@ -1,24 +1,11 @@
-/*
- *  sitemap.js
- *  
- *  depends on: prototype.js and lowpro.js
- *  
- *  Used by Radiant to create the expandable sitemap.
- *  
- *  To use, simply add the following lines to application.js:
- *  
- *     Event.addBehavior({
- *       'table#site_map': SiteMapBehavior()
- *     });
- *
- */
-
-var SiteMapBehavior = Behavior.create({
-  initialize: function() {
+var SiteMap = Class.create(RuledTable, {
+  initialize: function($super, element) {
+    $super(element);
     this.readExpandedCookie();
+    Event.observe(element, 'click', this.onMouseClickRow.bindAsEventListener(this));
   },
   
-  onclick: function(event) {
+  onMouseClickRow: function(event) {
     if (this.isExpander(event.target)) {
       var row = event.findElement('tr');
       if (this.hasChildren(row)) {
@@ -28,7 +15,7 @@ var SiteMapBehavior = Behavior.create({
   },
   
   hasChildren: function(row) {
-    return !row.hasClassName('no_children');
+    return !row.hasClassName('no-children');
   },
   
   isExpander: function(element) {
@@ -36,7 +23,7 @@ var SiteMapBehavior = Behavior.create({
   },
   
   isExpanded: function(row) {
-    return row.hasClassName('children_visible');
+    return row.hasClassName('children-visible');
   },
   
   isRow: function(element) {
@@ -44,12 +31,12 @@ var SiteMapBehavior = Behavior.create({
   },
   
   extractLevel: function(row) {
-    if (/level_(\d+)/i.test(row.className))
+    if (/level-(\d+)/i.test(row.className))
       return RegExp.$1.toInteger();
   },
   
   extractPageId: function(row) {
-    if (/page_(\d+)/i.test(row.id))
+    if (/page-(\d+)/i.test(row.id))
       return RegExp.$1.toInteger();
   },
   
@@ -81,13 +68,13 @@ var SiteMapBehavior = Behavior.create({
     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');
+      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');
+      row.removeClassName('children-hidden');
+      row.addClassName('children-visible');
       this.persistExpanded(row);
     }
   },
@@ -121,29 +108,25 @@ var SiteMapBehavior = Behavior.create({
   },
   
   getBranch: function(row) {
-    var id = this.extractPageId(row);
-    var level = this.extractLevel(row);
-    var spinner = $('busy_' + id);
+    var id = this.extractPageId(row), level = this.extractLevel(row),
+        spinner = $('busy-' + id);
         
     new Ajax.Updater(
       row,
-      '../admin/pages/' + id + '/children/?level=' + level,
+      '/admin/pages/' + id + '/children?level=' + level,
       {
         insertion: "after",
-        method: "get",
         onLoading:  function() { spinner.show(); this.updating = true  }.bind(this),
-        onComplete: function() { spinner.fade(); this.updating = false }.bind(this)
+        onComplete: function() { spinner.fade(); this.updating = false }.bind(this),
+        method: 'get'
       }
     );
   },
   
   toggleBranch: function(row, img) {
     if (!this.updating) {
-      if (this.isExpanded(row)) {
-        this.hideBranch(row, img);
-      } else {
-        this.showBranch(row, img);
-      }
+      var method = (this.isExpanded(row) ? 'hide' : 'show') + 'Branch';
+      this[method](row, img);
     }
   }
 });

data/public/javascripts/admin/tabcontrol.js

@@ -1,121 +1,133 @@
-if(typeof(relative_url_root) === 'undefined'){ relative_url_root = ''}
-
-var TabControlBehavior = Behavior.create({
-  initialize: function() {
-    new TabControl(this.element);
-  }
-});
-
 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) {
     this.element = $(element);
-    TabControls[this.element.identify()] = this;
-    this.tabs = $A();
-    this.tabContainer = this.element.down('.tabs');
-    this.tabContainer.observe('click', this.ontabclick.bind(this));
-    this.updateTabs();
-    this.autoSelect();
-  },
-  
-  updateTabs: function() {
-    this.element.select('.page').each(function(page) {
-      if (!this.findTabByPage(page)) this.addTab(page);
-    }.bind(this));
+    this.control_id = this.element.identify();
+    TabControl.controls.set(this.control_id, this);
+    this.tab_container = this.element.down('.tabs');
+    this.tabs = $H();
   },
   
-  addTab: function(page) {
-    var tab = new TabControl.Tab(page);
-    this.tabs.push(tab);
-    this.tabContainer.insert({bottom: tab});
-    $('page_part_index_field').setValue(this.tabs.length);
-    page.hide();
+  /*
+    Creates a new tab. The variable +tab_id+ is a unique string used to identify the tab
+    when calling other methods. The variable +caption+ is a string containing the caption
+    of the tab. The variable +page+ is the ID of an HTML element, or the HTML element
+    itself. When a tab is initially added the page element is hidden.
+  */
+  addTab: function(tab_id, caption, page) {
+    var tab = new TabControl.Tab(this, tab_id, caption, page);
+    
+    this.tabs.set(tab.id, tab);
+    return this.tab_container.appendChild(tab.createElement());
   },
   
-  removeSelected: function() {
-    var tab = this.selected;
-    var index = this.tabs.indexOf(tab);
-    var newSelectedTab = this.tabs[index-1];
-    var idInput = tab.page.down('.id_input');
-    var deleteInput = tab.page.down('.delete_input');
-    deleteInput.setValue('true');
+  /*
+    Removes +tab+. The variable +tab+ may be either a tab ID or a tab element.
+  */
+  removeTab: function(tab) {
+    if (Object.isString(tab)) tab = this.tabs.get(tab);
+    idInput = tab.content.down('.id_input');
+    deleteInput = tab.content.down('.delete_input');
     tab.remove();
-    this.tabs = this.tabs.without(tab);
-    this.element.insert(idInput).insert(deleteInput);
-    this.select(newSelectedTab || this.tabs.first());
+    this.tabs.unset(tab);
+    
+    if (this.selected == tab) {
+      var first = this.firstTab();
+      if (first) this.select(first);
+      else this.selected = null;
+    }
+
+    deleteInput.setValue('true');
+		this.tab_container.appendChild(idInput);
+		this.tab_container.appendChild(deleteInput);
   },
-  
+
+  /*
+    Selects +tab+ updating the control. The variable +tab+ may be either a tab ID or a
+    tab element.
+  */
   select: function(tab) {
+    if (Object.isString(tab)) tab = this.tabs.get(tab);
     if (this.selected) this.selected.unselect();
-    this.selected = tab;
     tab.select();
-    cookie = Cookie.set('current_tab', tab.caption, 24, '/admin');
+    this.selected = tab;
+    var persist = this.pageId() + ':' + this.selected.id;
+    document.cookie = "current_tab=" + persist + "; path=/admin";
   },
-  
-  autoSelect: function() {
-    if (!this.tabs.any()) return;
-    var caption = Cookie.get('current_tab');
-    var tab = this.findTabByCaption(caption);
-    this.select(tab || this.tabs.first());
+
+  /*
+    Returns the first tab element that was added using #addTab().
+  */
+  firstTab: function() {
+    return this.tabs.get(this.tabs.keys().first());
   },
   
-  ontabclick: function(event) {
-    var e = event.findElement('.tab');
-    if (e) {
-      var tab = this.findTabByElement(e);
-      if (tab) {
-        if (event.target.hasClassName('close')) {
-          if (confirm('Remove the "' + tab.caption + '" part?')) {
-            var lastSelected = this.selected;
-            this.select(tab);
-            this.removeSelected();
-            if (lastSelected != tab) this.select(lastSelected);
-          }
-        } else {
-          this.select(tab);
-        }
-        event.stop();
-      }
-    }
+  /*
+    Returns the the last tab element that was added using #addTab().
+  */
+  lastTab: function() {
+    return this.tabs.get(this.tabs.keys().last());
   },
   
-  findTabByCaption: function(caption) {
-    return this.tabs.detect(function(tab) { return tab.caption == caption });
+  /*
+    Returns the total number of tab elements managed by the control.
+  */
+  tabCount: function() {
+    return this.tabs.keys().length;
   },
-  
-  findTabByPage: function(page) {
-    return this.tabs.detect(function(tab) { return tab.page == page });
+
+  autoSelect: function() {
+    if (!this.tabs.any()) return; // no tabs in control
+    
+    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());
   },
-  
-  findTabByElement: function(element) {
-    return this.tabs.detect(function(tab) { return tab.element == element });
+
+  pageId: function() {
+    return /(\d+)/.test(window.location.pathname) ? RegExp.$1 : '';
   }
 });
 
+TabControl.controls = $H();
+
 TabControl.Tab = Class.create({
-  initialize: function(page) {
-    this.page = page;
-    this.caption = page.readAttribute('data-caption');
+  initialize: function(control, id, label, content) {
+    this.content = $(content).hide();
+    this.label   = label || id;
+    this.id      = id;
+    this.control = control;
   },
-  
+
+  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.page.show();
+    this.content.show();
     this.element.addClassName('here');
   },
-  
+
   unselect: function() {
-    this.page.hide();
+    this.content.hide();
     this.element.removeClassName('here');
   },
-  
+
   remove: function() {
-    this.page.remove();
-    this.element.remove();
-  },
-  
-  toElement: function() {
-    this.element = $a({'href': '#', 'class': 'tab'}, $span(this.caption), $img({'src': relative_url_root + '/images/admin/tab_close.png', 'class': 'close', 'alt': 'Remove part', 'title': 'Remove part'})).addClassName('tab');
-    return this.element;
+    this.content.remove();
+    this.element.stopObserving('click').remove();
   }
 });
-
-var TabControls = {};

data/public/javascripts/application.js

@@ -0,0 +1,2 @@
+// Place your application-specific JavaScript functions and classes here
+// This file is automatically included by javascript_include_tag :defaults

data/public/javascripts/{admin/controls.js → controls.js}

@@ -1,24 +1,22 @@
-// script.aculo.us controls.js v1.8.0, Tue Nov 06 15:01:40 +0300 2007
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
 // Contributors:
 //  Richard Livsey
 //  Rahul Bhargava
 //  Rob Wills
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
-// Autocompleter.Base handles all the autocompletion functionality 
+// Autocompleter.Base handles all the autocompletion functionality
 // that's independent of the data source for autocompletion. This
 // includes drawing the autocompletion menu, observing keyboard
 // and mouse events, and similar.
 //
-// Specific autocompleters need to provide, at the very least, 
+// Specific autocompleters need to provide, at the very least,
 // a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method 
+// the text inside the monitored textbox changes. This method
 // should get the text for which to provide autocompletion by
 // invoking this.getToken(), NOT by directly accessing
 // this.element.value. This is to allow incremental tokenized
@@ -32,23 +30,23 @@
 // will incrementally autocomplete with a comma as the token.
 // Additionally, ',' in the above example can be replaced with
 // a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most 
-// useful when one of the tokens is \n (a newline), as it 
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
 // allows smart autocompletion after linebreaks.
 
 if(typeof Effect == 'undefined')
   throw("controls.js requires including script.aculo.us' effects.js library");
 
-var Autocompleter = { }
+var Autocompleter = { };
 Autocompleter.Base = Class.create({
   baseInitialize: function(element, update, options) {
-    element          = $(element)
-    this.element     = element; 
-    this.update      = $(update);  
-    this.hasFocus    = false; 
-    this.changed     = false; 
-    this.active      = false; 
-    this.index       = 0;     
+    element          = $(element);
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
     this.entryCount  = 0;
     this.oldElementValue = this.element.value;
 
@@ -61,42 +59,42 @@ Autocompleter.Base = Class.create({
     this.options.tokens       = this.options.tokens || [];
     this.options.frequency    = this.options.frequency || 0.4;
     this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-      function(element, update){ 
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
         if(!update.style.position || update.style.position=='absolute') {
           update.style.position = 'absolute';
           Position.clone(element, update, {
-            setHeight: false, 
+            setHeight: false,
             offsetTop: element.offsetHeight
           });
         }
         Effect.Appear(update,{duration:0.15});
       };
-    this.options.onHide = this.options.onHide || 
+    this.options.onHide = this.options.onHide ||
       function(element, update){ new Effect.Fade(update,{duration:0.15}) };
 
-    if(typeof(this.options.tokens) == 'string') 
+    if(typeof(this.options.tokens) == 'string')
       this.options.tokens = new Array(this.options.tokens);
     // Force carriage returns as token delimiters anyway
     if (!this.options.tokens.include('\n'))
       this.options.tokens.push('\n');
 
     this.observer = null;
-    
+
     this.element.setAttribute('autocomplete','off');
 
     Element.hide(this.update);
 
     Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
   },
 
   show: function() {
     if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
+    if(!this.iefix &&
       (Prototype.Browser.IE) &&
       (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
+      new Insertion.After(this.update,
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
        'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
@@ -104,7 +102,7 @@ Autocompleter.Base = Class.create({
     }
     if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
   },
-  
+
   fixIEOverlapping: function() {
     Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
     this.iefix.style.zIndex = 1;
@@ -144,23 +142,23 @@ Autocompleter.Base = Class.create({
        case Event.KEY_UP:
          this.markPrevious();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
        case Event.KEY_DOWN:
          this.markNext();
          this.render();
-         if(Prototype.Browser.WebKit) Event.stop(event);
+         Event.stop(event);
          return;
       }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
          (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
 
     this.changed = true;
     this.hasFocus = true;
 
     if(this.observer) clearTimeout(this.observer);
-      this.observer = 
+      this.observer =
         setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
   },
 
@@ -172,35 +170,35 @@ Autocompleter.Base = Class.create({
 
   onHover: function(event) {
     var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex) 
+    if(this.index != element.autocompleteIndex)
     {
         this.index = element.autocompleteIndex;
         this.render();
     }
     Event.stop(event);
   },
-  
+
   onClick: function(event) {
     var element = Event.findElement(event, 'LI');
     this.index = element.autocompleteIndex;
     this.selectEntry();
     this.hide();
   },
-  
+
   onBlur: function(event) {
     // needed to make click events working
     setTimeout(this.hide.bind(this), 250);
     this.hasFocus = false;
-    this.active = false;     
-  }, 
-  
+    this.active = false;
+  },
+
   render: function() {
     if(this.entryCount > 0) {
       for (var i = 0; i < this.entryCount; i++)
-        this.index==i ? 
-          Element.addClassName(this.getEntry(i),"selected") : 
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
           Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) { 
+      if(this.hasFocus) {
         this.show();
         this.active = true;
       }
@@ -209,27 +207,27 @@ Autocompleter.Base = Class.create({
       this.hide();
     }
   },
-  
+
   markPrevious: function() {
-    if(this.index > 0) this.index--
+    if(this.index > 0) this.index--;
       else this.index = this.entryCount-1;
     this.getEntry(this.index).scrollIntoView(true);
   },
-  
+
   markNext: function() {
-    if(this.index < this.entryCount-1) this.index++
+    if(this.index < this.entryCount-1) this.index++;
       else this.index = 0;
     this.getEntry(this.index).scrollIntoView(false);
   },
-  
+
   getEntry: function(index) {
     return this.update.firstChild.childNodes[index];
   },
-  
+
   getCurrentEntry: function() {
     return this.getEntry(this.index);
   },
-  
+
   selectEntry: function() {
     this.active = false;
     this.updateElement(this.getCurrentEntry());
@@ -246,7 +244,7 @@ Autocompleter.Base = Class.create({
       if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
     } else
       value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
+
     var bounds = this.getTokenBounds();
     if (bounds[0] != -1) {
       var newValue = this.element.value.substr(0, bounds[0]);
@@ -259,7 +257,7 @@ Autocompleter.Base = Class.create({
     }
     this.oldElementValue = this.element.value;
     this.element.focus();
-    
+
     if (this.options.afterUpdateElement)
       this.options.afterUpdateElement(this.element, selectedElement);
   },
@@ -271,20 +269,20 @@ Autocompleter.Base = Class.create({
       Element.cleanWhitespace(this.update.down());
 
       if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount = 
+        this.entryCount =
           this.update.down().childNodes.length;
         for (var i = 0; i < this.entryCount; i++) {
           var entry = this.getEntry(i);
           entry.autocompleteIndex = i;
           this.addObservers(entry);
         }
-      } else { 
+      } else {
         this.entryCount = 0;
       }
 
       this.stopIndicator();
       this.index = 0;
-      
+
       if(this.entryCount==1 && this.options.autoSelect) {
         this.selectEntry();
         this.hide();
@@ -300,7 +298,7 @@ Autocompleter.Base = Class.create({
   },
 
   onObserverEvent: function() {
-    this.changed = false;   
+    this.changed = false;
     this.tokenBounds = null;
     if(this.getToken().length>=this.options.minChars) {
       this.getUpdatedChoices();
@@ -353,16 +351,16 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 
   getUpdatedChoices: function() {
     this.startIndicator();
-    
-    var entry = encodeURIComponent(this.options.paramName) + '=' + 
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
       encodeURIComponent(this.getToken());
 
     this.options.parameters = this.options.callback ?
       this.options.callback(this.element, entry) : entry;
 
-    if(this.options.defaultParams) 
+    if(this.options.defaultParams)
       this.options.parameters += '&' + this.options.defaultParams;
-    
+
     new Ajax.Request(this.url, this.options);
   },
 
@@ -384,7 +382,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - choices - How many autocompletion choices to offer
 //
 // - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the 
+//                    text only at the beginning of strings in the
 //                    autocomplete array. Defaults to true, which will
 //                    match text at the beginning of any *word* in the
 //                    strings in the autocomplete array. If you want to
@@ -401,7 +399,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - ignoreCase - Whether to ignore case when autocompleting.
 //                 Defaults to true.
 //
-// It's possible to pass in a custom function as the 'selector' 
+// It's possible to pass in a custom function as the 'selector'
 // option, if you prefer to write your own autocompletion logic.
 // In that case, the other options above will not apply unless
 // you support them.
@@ -429,20 +427,20 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
         var entry     = instance.getToken();
         var count     = 0;
 
-        for (var i = 0; i < instance.options.array.length &&  
-          ret.length < instance.options.choices ; i++) { 
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
 
           var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ? 
-            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
             elem.indexOf(entry);
 
           while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) { 
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
                 elem.substr(entry.length) + "</li>");
               break;
-            } else if (entry.length >= instance.options.partialChars && 
+            } else if (entry.length >= instance.options.partialChars &&
               instance.options.partialSearch && foundPos != -1) {
               if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
                 partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
@@ -452,14 +450,14 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
               }
             }
 
-            foundPos = instance.options.ignoreCase ? 
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
               elem.indexOf(entry, foundPos + 1);
 
           }
         }
         if (partial.length)
-          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
         return "<ul>" + ret.join('') + "</ul>";
       }
     }, options || { });
@@ -476,7 +474,7 @@ Field.scrollFreeActivate = function(field) {
   setTimeout(function() {
     Field.activate(field);
   }, 1);
-}
+};
 
 Ajax.InPlaceEditor = Class.create({
   initialize: function(element, url, options) {
@@ -606,7 +604,7 @@ Ajax.InPlaceEditor = Class.create({
     this.triggerCallback('onEnterHover');
   },
   getText: function() {
-    return this.element.innerHTML;
+    return this.element.innerHTML.unescapeHTML();
   },
   handleAJAXFailure: function(transport) {
     this.triggerCallback('onFailure', transport);
@@ -782,7 +780,7 @@ Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
       onSuccess: function(transport) {
         var js = transport.responseText.strip();
         if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-          throw 'Server returned an invalid collection representation.';
+          throw('Server returned an invalid collection representation.');
         this._collection = eval(js);
         this.checkForExternalText();
       }.bind(this),
@@ -939,7 +937,7 @@ Ajax.InPlaceCollectionEditor.DefaultOptions = {
   loadingCollectionText: 'Loading options...'
 };
 
-// Delayed observer, like Form.Element.Observer, 
+// Delayed observer, like Form.Element.Observer,
 // but waits for delay after last key input
 // Ideal for live-search fields
 
@@ -949,7 +947,7 @@ Form.Element.DelayedObserver = Class.create({
     this.element   = $(element);
     this.callback  = callback;
     this.timer     = null;
-    this.lastValue = $F(this.element); 
+    this.lastValue = $F(this.element);
     Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
   },
   delayedListener: function(event) {
@@ -962,4 +960,4 @@ Form.Element.DelayedObserver = Class.create({
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-});
+});