Merge pull request #50 from emagnier/resizable

Add option to disable or change the resize property.
refactory-id · Mar 12, 2014 · 9a4baa6 · 9a4baa6
2 parents 6c451ea + 8980a04
commit 9a4baa6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/css/bootstrap-markdown.min.css b/css/bootstrap-markdown.min.css
diff --git a/js/bootstrap-markdown.js b/js/bootstrap-markdown.js
@@ -131,7 +131,9 @@
           rowsVal = hasRows ? this.$textarea.attr('rows') : maxRows
 
       this.$textarea.attr('rows',rowsVal)
-      this.$textarea.css('resize','none')
+      if (this.$options.resize) {
+        this.$textarea.css('resize',this.$options.resize)
+      }
 
       this.$textarea
         .on('focus',    $.proxy(this.focus, this))
@@ -257,16 +259,27 @@
           editor.append(editorFooter)
         }
 
-        // Set width/height
-        $.each(['height','width'],function(k,attr){
-          if (options[attr] != 'inherit') {
-            if (jQuery.isNumeric(options[attr])) {
-              editor.css(attr,options[attr]+'px')
-            } else {
-              editor.addClass(options[attr])
-            }
+        // Set width
+        if (options.width && options.width !== 'inherit') {
+          if (jQuery.isNumeric(options.width)) {
+            editor.css('display', 'table')
+            textarea.css('width', options.width + 'px')
+          } else {
+            editor.addClass(options.width)
           }
-        })
+        }
+
+        // Set height
+        if (options.height && options.height !== 'inherit') {
+          if (jQuery.isNumeric(options.height)) {
+            var height = options.height
+            if (editorHeader) height = Math.max(0, height - editorHeader.outerHeight())
+            if (editorFooter) height = Math.max(0, height - editorFooter.outerHeight())
+            textarea.css('height', height + 'px')
+          } else {
+            editor.addClass(options.height)
+          }
+        }
 
         // Reference
         this.$editor     = editor
@@ -334,6 +347,12 @@
         container.parent().append(replacementContainer)
       }
 
+      // Set the preview element dimensions
+      replacementContainer.css({
+        width: container.outerWidth() + 'px',
+        height: container.outerHeight() + 'px'
+      })
+
       // Hide the last-active textarea
       container.hide()
 
@@ -678,6 +697,7 @@
     savable:false,
     width: 'inherit',
     height: 'inherit',
+    resize: 'none',
     iconlibrary: 'glyph',
 
     /* Buttons Properties */

diff --git a/less/bootstrap-markdown.less b/less/bootstrap-markdown.less
@@ -27,6 +27,7 @@
     border-top: 1px dashed @table-border-color;
     border-bottom: 1px dashed @table-border-color;
     min-height: 10px;
+    overflow: auto;
   }
 
   > textarea {