3 files changed, 28 insertions, 1 deletions
diff --git a/lib/images/wrap.gif b/lib/images/wrap.gif
new file mode 100644
index 000000000..f2253e4a2
--- /dev/null
+++ b/lib/images/wrap.gif
diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index df12a29fb..1f5a71e78 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -339,12 +339,16 @@ function initSizeCtl(ctlid,edid){
 
     var l = document.createElement('img');
     var s = document.createElement('img');
+    var w = document.createElement('img');
     l.src = DOKU_BASE+'lib/images/larger.gif';
     s.src = DOKU_BASE+'lib/images/smaller.gif';
+    w.src = DOKU_BASE+'lib/images/wrap.gif';
     addEvent(l,'click',function(){sizeCtl(edid,100);});
     addEvent(s,'click',function(){sizeCtl(edid,-100);});
+    addEvent(w,'click',function(){toggleWrap(edid);});
     ctl.appendChild(l);
     ctl.appendChild(s);
+    ctl.appendChild(w);
 }
 
 /**
@@ -360,6 +364,29 @@ function sizeCtl(edid,val){
 }
 
 /**
+ * Toggle the wrapping mode of a textarea
+ *
+ * @author Fluffy Convict <fluffyconvict@hotmail.com>
+ * @link   http://news.hping.org/comp.lang.javascript.archive/12265.html
+ * @author <shutdown@flashmail.com>
+ * @link   https://bugzilla.mozilla.org/show_bug.cgi?id=302710#c2
+ */
+function toggleWrap(edid){
+    var txtarea = $(edid);
+    var wrap = txtarea.getAttribute('wrap');
+    if(wrap && wrap.toLowerCase() == 'off'){
+        txtarea.setAttribute('wrap', 'soft');
+    }else{
+        txtarea.setAttribute('wrap', 'off');
+    }
+    // Fix display for mozilla
+    var parNod = txtarea.parentNode;
+    var nxtSib = txtarea.nextSibling;
+    parNod.removeChild(txtarea);
+    parNod.insertBefore(txtarea, nxtSib);
+}
+
+/**
  * Handler to close all open Popups
  */
 function closePopups(){
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 3c2cedfec..75e022385 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -148,7 +148,7 @@ div.dokuwiki div.toolbar, div.dokuwiki div#wiki__editbar {
 }
 div.dokuwiki div#size__ctl {
    float:right;
-   width:40px;
+   width:60px;
    height:2.7em;
 }
 div.dokuwiki #size__ctl img {