From a58bee7437717c46bef6eeb830383d87c98c9252 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 12 Dec 2009 15:28:05 -0600
Subject: [PATCH] Another Textarea Tweak and a Ruby 1.9 Fix

---
 lib/wiki_words.rb                 |  5 ++++-
 public/javascripts/page_helper.js | 11 +++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/wiki_words.rb b/lib/wiki_words.rb
index 27626dbe..28a505c7 100644
--- a/lib/wiki_words.rb
+++ b/lib/wiki_words.rb
@@ -1,5 +1,8 @@
 #coding: utf-8
 # Contains all the methods for finding and replacing wiki words
+
+require 'stringsupport'
+
 module WikiWords
   # In order of appearance: Latin, greek, cyrillic, armenian
   I18N_HIGHER_CASE_LETTERS =
@@ -18,7 +21,7 @@ module WikiWords
   CAMEL_CASED_WORD_BORDER = /([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u
 
   def self.separate(wiki_word)
-    wiki_word.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2')
+    wiki_word.dup.as_utf8.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2')
   end
 
 end
diff --git a/public/javascripts/page_helper.js b/public/javascripts/page_helper.js
index 9115c8bd..8c6843b1 100644
--- a/public/javascripts/page_helper.js
+++ b/public/javascripts/page_helper.js
@@ -57,13 +57,12 @@ function updateSize(elt, w, h) {
    // adjust to the size of the user's browser area.
    // w and h are the original, unadjusted, width and height per row/column
     var parentheight = document.viewport.getHeight() - $('pageName').getHeight() 
-                 - $('editFormButtons').getHeight() - $('hidebutton').getHeight();
+                  - $('editFormButtons').getHeight() - $('hidebutton').getHeight();
     var parentwidth = $('Content').getWidth();
     var f = $('MarkupHelp');
-    if (f.visible()) {parentwidth = parentwidth - f.getWidth() - 20}
-    var newcols = Math.floor(parentwidth/w) - 1;
-    var newrows = Math.floor(parentheight/h - 3);
-    elt.writeAttribute({'cols': newcols, 'rows': newrows });
+    if (f.visible()) { parentwidth = parentwidth - f.getWidth() - 20 }
+    elt.writeAttribute({'cols': Math.floor(parentwidth/w)  - 1,
+                        'rows': Math.floor(parentheight/h) - 6 });
     elt.setStyle({Width: parentwidth, Height: parentheight});
 }
 
@@ -71,7 +70,7 @@ function resizeableTextarea() {
 //make the textarea resize to fit available space
   var f = $('MarkupHelp');
   if (f) {
-    var hidebutton = new Element('input', {id:'hidebutton', type: 'button', value: 'Hide markup help'});
+    var hidebutton = new Element('input', {id:'hidebutton', type:'button', value: 'Hide markup help'});
     f.insert({before: hidebutton});
   }
   $$('textarea#content').each( function(textarea)  {