rails-bootstrap-markdown 0.0.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b27bac04a913814ecb58b4abbb151d3e8aac8acb
+  data.tar.gz: 1f18da19cced94651de9f54d38a46e40ae18ae6d
+SHA512:
+  metadata.gz: 6ef374aaeba24702f1797416d7f1dc329842d934921edf829527f152f4b4236e2566a43ad8737646f8b4f780dfb95844e8b7c2588acf97bf446fb63da91de205
+  data.tar.gz: 265fc5fb77cf588995e50a95980822f1f6e798cce7c7a7a50726f9a0cb4d210bdde2baf7d76926f7d2e1c4bf973ed68b367b94804032d636a91b1b07a0ac52d1

data/README.md

@@ -1,6 +1,6 @@
 # Rails::Bootstrap::Markdown
 
-A rails gem for [Bootstrap Markdown](http://toopay.github.io/bootstrap-markdown/), rewritten to SCSS for use with [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass)
+A rails gem for [Bootstrap Markdown](http://toopay.github.io/bootstrap-markdown/), rewritten to SCSS for use with [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass).
 
 3rd party libraries included:
 
@@ -16,7 +16,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -33,7 +33,7 @@ Or install it yourself as:
 ### Javascript
 
 ```
-//= requrie bootstrap-markdown
+//= require bootstrap-markdown
 ```
 
 ## Contributing

data/app/assets/javascripts/bootstrap-markdown.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-markdown.js v1.0.0
+ * bootstrap-markdown.js v2.1.0
  * http://github.com/toopay/bootstrap-markdown
  * ===================================================
  * Copyright 2013 Taufan Aditya
@@ -33,7 +33,6 @@
     this.$ns          = 'bootstrap-markdown'
     this.$element     = $(element)
     this.$editable    = {el:null, type:null,attrKeys:[], attrValues:[], content:null}
-    this.$cloneEditor = {el:null, type:null,attrKeys:[], attrValues:[], content:null}
     this.$options     = $.extend(true, {}, $.fn.markdown.defaults, options)
     this.$oldContent  = null
     this.$isPreview   = false
@@ -86,22 +85,32 @@
 
           for (z=0;z<buttons.length;z++) {
             var button = buttons[z],
+                buttonToggle = '',
                 buttonHandler = ns+'-'+button.name,
                 btnText = button.btnText ? button.btnText : '',
-                btnClass = button.btnClass ? button.btnClass : 'btn'
+                btnClass = button.btnClass ? button.btnClass : 'btn',
+                tabIndex = button.tabIndex ? button.tabIndex : '-1'
+
+            if (button.toggle == true) {
+              buttonToggle = ' data-toggle="button"'
+            }
 
             // Attach the button object
             btnGroupContainer.append('<button class="'
                                     +btnClass
-                                    +' btn-small" title="'
+                                    +' btn-default btn-sm" title="'
                                     +button.title
+                                    +'" tabindex="'
+                                    +tabIndex
                                     +'" data-provider="'
                                     +ns
                                     +'" data-handler="'
                                     +buttonHandler
-                                    +'"><i class="'
+                                    +'"'
+                                    +buttonToggle
+                                    +'><span class="'
                                     +button.icon
-                                    +'"></i> '
+                                    +'"></span> '
                                     +btnText
                                     +'</button>')
 
@@ -183,7 +192,7 @@
       if (this.$editor == null) {
         // Create the panel
         var editorHeader = $('<div/>', {
-                            'class': 'md-header'
+                            'class': 'md-header btn-toolbar'
                             })
 
         // Build the main buttons
@@ -292,8 +301,8 @@
       var options = this.$options,
           callbackContent = options.onPreview(this), // Try to get the content from callback
           container = this.$textarea,
+          afterContainer = container.next(),
           replacementContainer = $('<div/>',{'class':'md-preview','data-provider':'markdown-preview'}),
-          cloneEditor = this.$cloneEditor,
           content
 
       // Give flag that tell the editor enter preview mode
@@ -301,18 +310,6 @@
       // Disable all buttons
       this.disableButtons('all').enableButtons('cmdPreview')
 
-      // Save the editor
-      cloneEditor.el = container
-      cloneEditor.type = container.prop('tagName').toLowerCase()
-      cloneEditor.content = container.val()
-
-      $(container[0].attributes).each(function(){
-        cloneEditor.attrKeys.push(this.nodeName)
-        cloneEditor.attrValues.push(this.nodeValue)
-      })
-
-      this.$cloneEditor = cloneEditor
-
       if (typeof callbackContent == 'string') {
         // Set the content based by callback content
         content = callbackContent
@@ -321,9 +318,19 @@
         content = (typeof markdown == 'object') ? markdown.toHTML(container.val()) : container.val()
       }
 
-      // Build preview element and replace the editor temporarily
+      // Build preview element
       replacementContainer.html(content)
-      container.replaceWith(replacementContainer)
+
+      if (afterContainer && afterContainer.attr('class') == 'md-footer') {
+        // If there is footer element, insert the preview container before it
+        replacementContainer.insertBefore(afterContainer)
+      } else {
+        // Otherwise, just append it after textarea
+        container.parent().append(replacementContainer)
+      }
+
+      // Hide the last-active textarea
+      container.hide()
 
       // Attach the editor instances
       replacementContainer.data('markdown',this)
@@ -335,26 +342,17 @@
       // Give flag that tell the editor quit preview mode
       this.$isPreview = false
 
-      // Build the original element
-      var container = this.$editor.find('div[data-provider="markdown-preview"]'),
-          cloneEditor = this.$cloneEditor,
-          oldElement = $('<'+cloneEditor.type+'/>')
+      // Obtain the preview container
+      var container = this.$editor.find('div[data-provider="markdown-preview"]')
 
-      $(cloneEditor.attrKeys).each(function(k,v) {
-        oldElement.attr(cloneEditor.attrKeys[k],cloneEditor.attrValues[k])
-      })
-
-      // Set the editor content
-      oldElement.val(cloneEditor.content)
-
-      // Set the editor data
-      container.replaceWith(oldElement)
+      // Remove the preview container
+      container.remove()
 
       // Enable all buttons
       this.enableButtons('all')
 
       // Back to the editor
-      this.$textarea = oldElement
+      this.$textarea.show()
       this.__setListener()
 
       return this
@@ -365,7 +363,7 @@
     }
 
   , getContent: function() {
-      return (this.$isPreview) ? this.$cloneEditor.content : this.$textarea.val()
+      return this.$textarea.val()
     }
 
   , setContent: function(content) {
@@ -548,12 +546,25 @@
             setTimeout(function(){
               that.setSelection(nextTab.start,nextTab.end)
             },500)
+
+            blocked = true
           } else {
-            // Put the cursor to the end
-            this.setSelection(this.getContent().length,this.getContent().length)
+            // The next tab memory contains nothing...
+            // check the cursor position to determine tab action
+            var cursor = this.getSelection()
+
+            if (cursor.start == cursor.end && cursor.end == this.getContent().length) {
+              // The cursor already reach the end of the content
+              blocked = false
+
+            } else {
+              // Put the cursor to the end
+              this.setSelection(this.getContent().length,this.getContent().length)
+
+              blocked = true
+            }
           }
 
-          blocked = true
           break
 
         case 13: // enter
@@ -603,11 +614,6 @@
           editor = this.$editor,
           editable = this.$editable
 
-      // Force to quit preview mode
-      if (this.$isPreview) {
-        this.hidePreview()
-      }
-
       if (editor.hasClass('active') || this.$element.parent().length == 0) {
         editor.removeClass('active')
 
@@ -672,7 +678,7 @@
         data: [{
           name: 'cmdBold',
           title: 'Bold',
-          icon: 'icon icon-bold',
+          icon: 'glyphicon glyphicon-bold',
           callback: function(e){
             // Give/remove ** surround the selection
             var chunk, cursor, selected = e.getSelection(), content = e.getContent()
@@ -701,7 +707,7 @@
         },{
           name: 'cmdItalic',
           title: 'Italic',
-          icon: 'icon icon-italic',
+          icon: 'glyphicon glyphicon-italic',
           callback: function(e){
             // Give/remove * surround the selection
             var chunk, cursor, selected = e.getSelection(), content = e.getContent()
@@ -730,7 +736,7 @@
         },{
           name: 'cmdHeading',
           title: 'Heading',
-          icon: 'icon icon-font',
+          icon: 'glyphicon glyphicon-font',
           callback: function(e){
             // Append/remove ### surround the selection
             var chunk, cursor, selected = e.getSelection(), content = e.getContent(), pointer, prevChar
@@ -766,7 +772,7 @@
         data: [{
           name: 'cmdUrl',
           title: 'URL/Link',
-          icon: 'icon icon-globe',
+          icon: 'glyphicon glyphicon-globe',
           callback: function(e){
             // Give [] surround the selection and prepend the link
             var chunk, cursor, selected = e.getSelection(), content = e.getContent(), link
@@ -792,7 +798,7 @@
         },{
           name: 'cmdImage',
           title: 'Image',
-          icon: 'icon icon-picture',
+          icon: 'glyphicon glyphicon-picture',
           callback: function(e){
             // Give ![] surround the selection and prepend the image link
             var chunk, cursor, selected = e.getSelection(), content = e.getContent(), link
@@ -824,7 +830,7 @@
         data: [{
           name: 'cmdList',
           title: 'List',
-          icon: 'icon icon-list',
+          icon: 'glyphicon glyphicon-list',
           callback: function(e){
             // Prepend/Give - surround the selection
             var chunk, cursor, selected = e.getSelection(), content = e.getContent()
@@ -873,10 +879,11 @@
         name: 'groupUtil',
         data: [{
           name: 'cmdPreview',
+          toggle: true,
           title: 'Preview',
           btnText: 'Preview',
-          btnClass: 'btn btn-inverse',
-          icon: 'icon icon-white icon-search',
+          btnClass: 'btn btn-primary btn-sm',
+          icon: 'glyphicon glyphicon-search',
           callback: function(e){
             // Check the preview mode and toggle based on this flag
             var isPreview = e.$isPreview,content
@@ -986,4 +993,4 @@
       })
     })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/stylesheets/bootstrap-markdown.css.scss

@@ -1,62 +1,60 @@
 /**
- * Bootstrap-Markdown.css.scss
- *
- * Converted to SCSS by Danny Tatom @dannytatom
+ * Bootstrap-Markdown.less
  *
  * @author Taufan Aditya @taufanaditya
  * @copyright 2013 Taufan Aditya
  */
 
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
+@import "bootstrap/variables"; // Point this into your bootstrap variables
+@import "bootstrap/mixins"; // Point this into your bootstrap variables
+
+// Hover state
+$color: $input-border-focus;
+$color-rgba: rgba(red($color), green($color), blue($color), .6);
 
 .md-editor {
   display: block;
-  border: 1px solid $tableBorder;
+  border: 1px solid $table-border-color;
 
   .md-header, .md-footer {
     display: block;
     padding: 6px 4px;
-    background: $white;
+    background: $panel-default-heading-bg;
   }
 
   .md-preview {
-    background: $white;
-    border-top: 1px dashed $tableBorder;
-    border-bottom: 1px dashed $tableBorder;
+    background: $panel-bg;
+    border-top: 1px dashed $table-border-color;
+    border-bottom: 1px dashed $table-border-color;
     min-height: 10px;
   }
 
   textarea {
-    font-family: $monoFontFamily;
-    font-size: $baseFontSize;
+    font-family: $font-family-monospace;
+    font-size: $font-size-base;
     outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
+    outline: thin dotted  \9; /* IE6-9 */
     margin: 0;
     display: block;
     padding: 0;
     width: 100%;
     border: 0;
-    border-top: 1px dashed $tableBorder;
-    border-bottom: 1px dashed $tableBorder;
+    border-top: 1px dashed $table-border-color;
+    border-bottom: 1px dashed $table-border-color;
     border-radius: 0;
     box-shadow: none;
-    background: $inputDisabledBackground;
+    background: $input-bg-disabled;
 
     &:focus {
       box-shadow: none;
-      background: $inputBackground;
+      background: $input-bg;
     }
   }
 
-  // Hover state
   &.active {
-    @include box-shadow("inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-
-    border-color: rgba(82,168,236,.8);
+    border-color: $color;
     outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
 
-    @include transition(border linear .2s, box-shadow linear .2s);
+    @include box-shadow("inset 0 1px 1px rgba(0, 0, 0, 0.75), 0 0 0 8px rgba(#{$color-rgba})")
   }
-}
+}

data/lib/rails-bootstrap-markdown/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Bootstrap
     module Markdown
-      VERSION = "0.0.2"
+      VERSION = "1.0.0"
     end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-bootstrap-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Danny Tatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -32,32 +31,26 @@ files:
 - rails-bootstrap-markdown.gemspec
 homepage: http://github.com/dannytatom/rails-bootstrap-markdown
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2957847032896564447
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2957847032896564447
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails gem for Bootstrap Markdown
 test_files: []
+has_rdoc: