summernote-rails 0.6.9.0 → 0.6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cb15d8591364b1ceb1017edf2162d29900cee9
-  data.tar.gz: 7c2d869058695740d1346e0be7fbbf424ac2a4df
+  metadata.gz: d45118cd2c6daef234a3b91115d357913e0d586e
+  data.tar.gz: 8784f964bfed64720568d152cda3a49945f8e4ee
 SHA512:
-  metadata.gz: f1f5990ca679cb884e949d73b2bbc8c1dc5e944f17d9e632b42e52ff90e3910051f122315685704e3345d8b139b2613282ab11e08bc61d1a09e461657a61ad4e
-  data.tar.gz: 962edc4c209758d9aee11d4a6a948163a203ebf482f2112b0bdd7394e737f7ddebf1b2a16366fc3bf1f5109d7880b03f29ca271e4b204e3b0cb5ba80f1996f8b
+  metadata.gz: 41334e91c1d3d7fa593ac98013c465e782ade847ebb2468b8fdee19dac878432433c6177b800c7bde754836fa76e8b94dd462f256a4f2d20e7a7e20c57478d40
+  data.tar.gz: af11b642c2fe451e5942ecb2a7ab9ecabc0e0161596b77b137b95bcbd10dc26323dc60fd821393f470019daa38023c8d4eecd40e558b1511df7bad667c046d04

data/lib/summernote-rails/version.rb

@@ -1,5 +1,5 @@
 module SummernoteRails
   module Rails
-    VERSION = "0.6.9.0"
+    VERSION = "0.6.10.0"
   end
 end

data/vendor/assets/javascripts/summernote/locales/tr-TR.js

@@ -9,8 +9,8 @@
         height: 'Satır yüksekliği',
         name: 'Yazı Tipi',
         strikethrough: 'Üstü çizili',
-        subscript: 'Subscript',
-        superscript: 'Superscript',
+        subscript: 'Alt Simge',
+        superscript: 'Üst Simge',
         size: 'Yazı tipi boyutu'
       },
       image: {

data/vendor/assets/javascripts/summernote/plugin/summernote-ext-hint.js

@@ -8,8 +8,8 @@
     factory(window.jQuery);
   }
 }(function ($) {
+  // import core class
   var range = $.summernote.core.range;
-  var list = $.summernote.core.list;
 
   var KEY = {
     UP: 38,
@@ -17,17 +17,52 @@
     ENTER: 13
   };
 
-  var DROPDOWN_KEYCODES = [38, 40, 13];
+  var DROPDOWN_KEYCODES = [KEY.UP, KEY.DOWN, KEY.ENTER];
 
   /**
    * @class plugin.hint
-   * 
-   * Hello Plugin  
+   *
+   * Hint Plugin
    */
   $.summernote.addPlugin({
-    /** @property {String} name name of plugin */
+    /**
+     * name name of plugin
+     * @property {String}
+     **/
     name: 'hint',
 
+    /**
+     * @property {Regex}
+     * @interface
+     */
+    match: /[a-z]+/g,
+
+    /**
+     * create list item template
+     *
+     * @interface
+     * @param {Object} search
+     * @returns {Array}  created item list
+     */
+    template: null,
+
+    /**
+     * create inserted content to add  in summernote
+     *
+     * @interface
+     * @param {String} html
+     * @param {String} keyword
+     * @return {HTMLEleemnt|String}
+     */
+    content: null,
+
+    /**
+     * load search list
+     *
+     * @interface
+     */
+    load: null,
+
     /**
      * @param {jQuery} $node
      */
@@ -76,7 +111,7 @@
     replace: function ($popover) {
       var wordRange = $popover.data('wordRange');
       var $activeItem = $popover.find('.active');
-      var content = this.content($activeItem.html(), $activeItem.data('keyword'));
+      var content = this.content($activeItem.data('item'));
 
       if (typeof content === 'string') {
         content = document.createTextNode(content);
@@ -92,38 +127,24 @@
      * @param {String} keyword
      * @return {Object|null}
      */
-    searchKeyword: function (keyword) {
-      var triggerChar = keyword.charAt(0);
-
-      if (triggerChar === ':' && keyword.length > 1) {
-        var trigger = keyword.toLowerCase().replace(':', '');
-        return {
-          type: 'emoji',
-          list: $.grep(this.emojiKeys, function (item) {
-            return item.indexOf(trigger) === 0;
-          })
-        };
+    searchKeyword: function (keyword, callback) {
+      if (this.match.test(keyword)) {
+        var matches = this.match.exec(keyword);
+        this.search(matches[1], callback);
+      } else {
+        callback();
       }
-
-      return null;
     },
 
-    /**
-     * create items
-     *
-     * @param {Object} searchResult
-     * @param {String} searchResult.type
-     * @param {String[]} searchResult.list
-     * @return {jQuery[]}
-     */
-    createItems: function (searchResult) {
-      var items = [];
-      var list = searchResult.list;
+
+    createTemplate: function (list) {
+      var items  = [];
+      list = list || [];
 
       for (var i = 0, len = list.length; i < len; i++) {
         var $item = $('<a class="list-group-item"></a>');
-        $item.append(this.createItem(list[i]));
-        $item.data('keyword', list[i]);
+        $item.append(this.template(list[i]));
+        $item.data('item', list[i]);
         items.push($item);
       }
 
@@ -134,74 +155,39 @@
       return items;
     },
 
-    /**
-     * create list item template
-     *
-     * @param {Object} item
-     * @returns {String}
-     */
-    createItem: function (item) {
-      var content = this.emojiInfo[item];
-      return '<img src="' + content + '" width="20" /> :' + item + ':';
-    },
-
-    /**
-     * create inserted content to add in summernote
-     *
-     * @param {String} html
-     * @param {String} keyword
-     * @return {Node|String}
-     */
-    content: function (html, item) {
-      var url = this.emojiInfo[item];
-
-      if (url) {
-        var $img = $('<img />').attr('src', url).css({
-          width : 20
-        });
-        return $img[0];
-      }
-
-      return html;
-    },
-
-    /**
-     * @return {Promise}
-     */
-    loadEmojis: function () {
-      var self = this;
-      return $.getJSON('https://api.github.com/emojis').then(function (data) {
-        self.emojiKeys = Object.keys(data);
-        self.emojiInfo = data;
-      });
+    search: function (keyword, callback) {
+      keyword = keyword || '';
+      callback();
     },
 
-    init: function (layoutInfo) {
+    init : function (layoutInfo) {
       var self = this;
 
       var $note = layoutInfo.holder();
-      var $popover = $('<div class="list-group" />').css({
-        position: 'absolute',
-        'max-height': 300,
-        'overflow-y': 'scroll',
-        'display': 'none'
+      var $popover = $('<div />').addClass('hint-group').css({
+        'position': 'absolute',
+        'max-height': 150,
+        'z-index' : 999,
+        'overflow' : 'hidden',
+        'display' : 'none',
+        'border' : '1px solid gray',
+        'border-radius' : '5px'
       });
 
-      // FIXME We need a handler for unload resources.
-      $popover.on('click', '.list-group-item', function () {
+      $popover.on('click', '.list-group-item', function HintItemClick() {
         self.replace($popover);
 
         $popover.hide();
         $note.summernote('focus');
       });
 
-      $(document).on('click', function () {
+      $(document).on('click', function HintClick() {
         $popover.hide();
       });
 
-      $note.on('summernote.keydown', function (customEvent, nativeEvent) {
+      $note.on('summernote.keydown', function HintKeyDown(customEvent, nativeEvent) {
         if ($popover.css('display') !== 'block') {
-          return;
+          return true;
         }
 
         if (nativeEvent.keyCode === KEY.DOWN) {
@@ -219,34 +205,65 @@
         }
       });
 
-      $note.on('summernote.keyup', function (customEvent, nativeEvent) {
-        if (DROPDOWN_KEYCODES.indexOf(nativeEvent.keyCode) === -1) {
-          var wordRange = $(this).summernote('createRange').getWordRange();
-          var result = self.searchKeyword(wordRange.toString());
-          if (!result || !result.list.length) {
-            $popover.hide();
-            return;
+      var timer = null;
+      $note.on('summernote.keyup', function HintKeyUp(customEvent, nativeEvent) {
+        if (DROPDOWN_KEYCODES.indexOf(nativeEvent.keyCode) > -1) {
+          if (nativeEvent.keyCode === KEY.ENTER) {
+            if ($popover.css('display') === 'block') {
+              return false;
+            }
           }
 
-          layoutInfo.popover().append($popover);
+        } else {
+
+          clearTimeout(timer);
+          timer = setTimeout(function () {
+            var range = $note.summernote('createRange');
+            var word = range.getWordRange();
+
+            self.searchKeyword(word.toString(), function (searchList) {
+              if (!searchList) {
+                $popover.hide();
+                return;
+              }
+
+              if (searchList && !searchList.length) {
+                $popover.hide();
+                return;
+              }
+
+              layoutInfo.popover().append($popover);
+
+              // popover below placeholder.
+              var rects = word.getClientRects();
+              var rect = rects[rects.length - 1];
+              $popover.html(self.createTemplate(searchList)).css({
+                left: rect.left,
+                top: rect.top + rect.height
+              }).data('wordRange', word).show();
+            });
+          }, self.throttle);
 
-          var rect = list.last(wordRange.getClientRects());
-          $popover.html(self.createItems(result)).css({
-            left: rect.left,
-            top: rect.top + rect.height
-          }).data('wordRange', wordRange).show();
         }
       });
 
-      this.loadEmojis();
+      this.load($popover);
     },
 
+    throttle : 50,
+
     // FIXME Summernote doesn't support event pipeline yet.
     //  - Plugin -> Base Code
     events: {
-      ENTER: function () {
+      ENTER: function (e, editor, layoutInfo) {
+
+        if (layoutInfo.popover().find('.hint-group').css('display') !== 'block') {
+          // apply default enter key
+          layoutInfo.holder().summernote('insertParagraph');
+        }
+
         // prevent ENTER key
-        return false;
+        return true;
       }
     }
   });

data/vendor/assets/javascripts/summernote/summernote.js

@@ -1,12 +1,12 @@
 /**
- * Super simple wysiwyg editor on Bootstrap v0.6.8
+ * Super simple wysiwyg editor on Bootstrap v0.6.10
  * http://summernote.org/
  *
  * summernote.js
  * Copyright 2013-2015 Alan Hong. and other contributors
  * summernote may be freely distributed under the MIT license./
  *
- * Date: 2015-06-21T11:34Z
+ * Date: 2015-07-12T14:23Z
  */
 (function (factory) {
   /* global define */
@@ -516,9 +516,14 @@
 
         // frame mode
       } else {
-        makeFinder = function (sClassName) {
-          return function () { return $editor.find(sClassName); };
+        makeFinder = function (sClassName, sBaseElement) {
+          var $baseElement = sBaseElement ? $(sBaseElement) : $editor;
+          return function () { return $baseElement.find(sClassName); };
         };
+
+        var options = $editor.data('options');
+        var dialogHolder = (options && options.dialogsInBody) ? document.body : null;
+
         return {
           editor: function () { return $editor; },
           holder : function () { return $editor.data('holder'); },
@@ -529,7 +534,7 @@
           statusbar: makeFinder('.note-statusbar'),
           popover: makeFinder('.note-popover'),
           handle: makeFinder('.note-handle'),
-          dialog: makeFinder('.note-dialog')
+          dialog: makeFinder('.note-dialog', dialogHolder)
         };
       }
     };
@@ -977,6 +982,26 @@
       return true;
     };
 
+    /**
+     * returns whether point is left edge of ancestor or not.
+     * @param {BoundaryPoint} point
+     * @param {Node} ancestor
+     * @return {Boolean}
+     */
+    var isLeftEdgePointOf = function (point, ancestor) {
+      return isLeftEdgePoint(point) && isLeftEdgeOf(point.node, ancestor);
+    };
+
+    /**
+     * returns whether point is right edge of ancestor or not.
+     * @param {BoundaryPoint} point
+     * @param {Node} ancestor
+     * @return {Boolean}
+     */
+    var isRightEdgePointOf = function (point, ancestor) {
+      return isRightEdgePoint(point) && isRightEdgeOf(point.node, ancestor);
+    };
+
     /**
      * returns offset from parent.
      *
@@ -1485,6 +1510,8 @@
       isEdgePoint: isEdgePoint,
       isLeftEdgeOf: isLeftEdgeOf,
       isRightEdgeOf: isRightEdgeOf,
+      isLeftEdgePointOf: isLeftEdgePointOf,
+      isRightEdgePointOf: isRightEdgePointOf,
       prevPoint: prevPoint,
       nextPoint: nextPoint,
       isSamePoint: isSamePoint,
@@ -1710,21 +1737,37 @@
 
         /**
          * @param {BoundaryPoint} point
+         * @param {Boolean} isLeftToRight
          * @return {BoundaryPoint}
          */
-        var getVisiblePoint = function (point) {
-          if (!dom.isVisiblePoint(point)) {
-            if (dom.isLeftEdgePoint(point)) {
-              point = dom.nextPointUntil(point, dom.isVisiblePoint);
-            } else {
-              point = dom.prevPointUntil(point, dom.isVisiblePoint);
+        var getVisiblePoint = function (point, isLeftToRight) {
+          if ((dom.isVisiblePoint(point) && !dom.isEdgePoint(point)) ||
+              (dom.isVisiblePoint(point) && dom.isRightEdgePoint(point) && !isLeftToRight) ||
+              (dom.isVisiblePoint(point) && dom.isLeftEdgePoint(point) && isLeftToRight) ||
+              (dom.isVisiblePoint(point) && dom.isBlock(point.node) && dom.isEmpty(point.node))) {
+            return point;
+          }
+
+          // point on block's edge
+          var block = dom.ancestor(point.node, dom.isBlock);
+          if ((dom.isLeftEdgePointOf(point, block) && !isLeftToRight) ||
+              (dom.isRightEdgePointOf(point, block) && isLeftToRight)) {
+
+            // returns point already on visible point
+            if (dom.isVisiblePoint(point)) {
+              return point;
             }
+            // reverse direction 
+            isLeftToRight = !isLeftToRight;
           }
-          return point;
+
+          var nextPoint = isLeftToRight ? dom.nextPointUntil(dom.nextPoint(point), dom.isVisiblePoint) :
+                                          dom.prevPointUntil(dom.prevPoint(point), dom.isVisiblePoint);
+          return nextPoint || point;
         };
 
-        var startPoint = getVisiblePoint(this.getStartPoint());
-        var endPoint = getVisiblePoint(this.getEndPoint());
+        var endPoint = getVisiblePoint(this.getEndPoint(), false);
+        var startPoint = this.isCollapsed() ? endPoint : getVisiblePoint(this.getStartPoint(), true);
 
         return new WrappedRange(
           startPoint.node,
@@ -1958,20 +2001,26 @@
           return new WrappedRange(sc.firstChild, 0, sc.firstChild, 0);
         }
 
+        /**
+         * [workaround] firefox often create range on not visible point. so normalize here.
+         *  - firefox: |<p>text</p>|
+         *  - chrome: <p>|text|</p>
+         */
+        var rng = this.normalize();
         if (dom.isParaInline(sc) || dom.isPara(sc)) {
-          return this.normalize();
+          return rng;
         }
 
         // find inline top ancestor
         var topAncestor;
-        if (dom.isInline(sc)) {
-          var ancestors = dom.listAncestor(sc, func.not(dom.isInline));
+        if (dom.isInline(rng.sc)) {
+          var ancestors = dom.listAncestor(rng.sc, func.not(dom.isInline));
           topAncestor = list.last(ancestors);
           if (!dom.isInline(topAncestor)) {
-            topAncestor = ancestors[ancestors.length - 2] || sc.childNodes[so];
+            topAncestor = ancestors[ancestors.length - 2] || rng.sc.childNodes[rng.so];
           }
         } else {
-          topAncestor = sc.childNodes[so > 0 ? so - 1 : 0];
+          topAncestor = rng.sc.childNodes[rng.so > 0 ? rng.so - 1 : 0];
         }
 
         // siblings not in paragraph
@@ -2271,7 +2320,7 @@
    */
   var defaults = {
     /** @property */
-    version: '0.6.8',
+    version: '0.6.10',
 
     /**
      * 
@@ -3386,6 +3435,7 @@
    */
   var Editor = function (handler) {
 
+    var self = this;
     var style = new Style();
     var table = new Table();
     var typing = new Typing();
@@ -3474,7 +3524,7 @@
      * @return {Boolean} false if range is no
      */
     this.currentStyle = function (target) {
-      var rng = range.create();
+      var rng = range.create().normalize();
       return rng ? rng.isOnEditable() && style.current(rng, target) : false;
     };
 
@@ -3514,7 +3564,6 @@
       triggerOnChange($editable);
     };
 
-    var self = this;
     /**
      * @method beforeCommand
      * before command
@@ -3846,9 +3895,8 @@
      */
     this.fontSize = function ($editable, value) {
       var rng = range.create();
-      var isCollapsed = rng.isCollapsed();
 
-      if (isCollapsed) {
+      if (rng.isCollapsed()) {
         var spans = style.styleNodes(rng);
         var firstSpan = list.head(spans);
 
@@ -3939,9 +3987,11 @@
       var linkUrl = linkInfo.url;
       var linkText = linkInfo.text;
       var isNewWindow = linkInfo.newWindow;
-      var rng = linkInfo.range;
+      var rng = linkInfo.range || this.createRange($editable);
       var isTextChanged = rng.toString() !== linkText;
 
+      options = options || dom.makeLayoutInfo($editable).editor().data('options');
+
       beforeCommand($editable);
 
       if (options.onCreateLink) {
@@ -4949,11 +4999,11 @@
         $paste = $('<div />').attr('contenteditable', true).css({
           position : 'absolute',
           left : -100000,
-          'opacity' : 0
+          opacity : 0
         });
         layoutInfo.editable().after($paste);
-        $paste.one('paste', hPasteClipboardImage);
-        
+        $paste.on('paste', hPasteClipboardImage);
+
         layoutInfo.editable().on('keydown', function (e) {
           if (e.ctrlKey && e.keyCode === 86) {  // CTRL+V
             handler.invoke('saveRange', layoutInfo.editable());
@@ -4967,6 +5017,15 @@
       layoutInfo.editable().on('paste', hPasteClipboardImage);
     };
 
+    var hPasteContent = function (handler, $paste, $editable) {
+      var pasteContent = $('<div />').html($paste.html());
+
+      handler.invoke('restoreRange', $editable);
+      handler.invoke('focus', $editable);
+      handler.invoke('pasteHTML', $editable, pasteContent.html());
+      $paste.empty();
+    };
+
     /**
      * paste clipboard image
      *
@@ -4983,6 +5042,7 @@
         var callbacks = $editable.data('callbacks');
         // only can run if it has onImageUpload method
         if (!callbacks.onImageUpload) {
+          hPasteContent(handler, $paste, $editable);
           return;
         }
 
@@ -4993,13 +5053,14 @@
 
           var imgNode = $paste[0].firstChild;
           if (!imgNode) {
+            hPasteContent(handler, $paste, $editable);
             return;
           }
 
-          handler.invoke('restoreRange', $editable);
           if (!dom.isImg(imgNode)) {
-            handler.invoke('pasteHTML', $editable, $paste.html());
+            hPasteContent(handler, $paste, $editable);
           } else {
+            handler.invoke('restoreRange', $editable);
             var datauri = imgNode.src;
 
             var data = atob(datauri.split(',')[1]);
@@ -5012,9 +5073,9 @@
             blob.name = 'clipboard.png';
             handler.invoke('focus', $editable);
             handler.insertImages(layoutInfo, [blob]);
-          }
 
-          $paste.remove();
+            $paste.empty();
+          }
 
         }, 0);
 
@@ -5865,7 +5926,7 @@
                '<div class="popover-content">' +
                '</div>' +
              '</div>');
-      
+
       $popover.find('.popover-content').append(content);
       return $popover;
     };
@@ -5897,6 +5958,23 @@
              '</div>';
     };
 
+    /**
+     * bootstrap dropdown template
+     *
+     * @param {String|String[]} contents
+     * @param {String} [className='']
+     * @param {String} [nodeName='']
+     */
+    var tplDropdown = function (contents, className, nodeName) {
+      var classes = 'dropdown-menu' + (className ? ' ' + className : '');
+      nodeName = nodeName || 'ul';
+      if (contents instanceof Array) {
+        contents = contents.join('');
+      }
+
+      return '<' + nodeName + ' class="' + classes + '">' + contents + '</' + nodeName + '>';
+    };
+
     var tplButtonInfo = {
       picture: function (lang, options) {
         return tplIconButton(options.iconPrefix + options.icons.image.image, {
@@ -5913,17 +5991,18 @@
         });
       },
       table: function (lang, options) {
-        var dropdown = '<ul class="note-table dropdown-menu">' +
-                         '<div class="note-dimension-picker">' +
-                           '<div class="note-dimension-picker-mousecatcher" data-event="insertTable" data-value="1x1"></div>' +
-                           '<div class="note-dimension-picker-highlighted"></div>' +
-                           '<div class="note-dimension-picker-unhighlighted"></div>' +
-                         '</div>' +
-                         '<div class="note-dimension-display"> 1 x 1 </div>' +
-                       '</ul>';
+        var dropdown = [
+          '<div class="note-dimension-picker">',
+          '<div class="note-dimension-picker-mousecatcher" data-event="insertTable" data-value="1x1"></div>',
+          '<div class="note-dimension-picker-highlighted"></div>',
+          '<div class="note-dimension-picker-unhighlighted"></div>',
+          '</div>',
+          '<div class="note-dimension-display"> 1 x 1 </div>'
+        ];
+
         return tplIconButton(options.iconPrefix + options.icons.table.table, {
           title: lang.table.table,
-          dropdown: dropdown
+          dropdown: tplDropdown(dropdown, 'note-table')
         });
       },
       style: function (lang, options) {
@@ -5939,7 +6018,7 @@
 
         return tplIconButton(options.iconPrefix + options.icons.style.style, {
           title: lang.style.style,
-          dropdown: '<ul class="dropdown-menu">' + items + '</ul>'
+          dropdown: tplDropdown(items)
         });
       },
       fontname: function (lang, options) {
@@ -5956,14 +6035,14 @@
 
         var hasDefaultFont = agent.isFontInstalled(options.defaultFontName);
         var defaultFontName = (hasDefaultFont) ? options.defaultFontName : realFontList[0];
-          
+
         var label = '<span class="note-current-fontname">' +
                         defaultFontName +
                      '</span>';
         return tplButton(label, {
           title: lang.font.name,
           className: 'note-fontname',
-          dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
+          dropdown: tplDropdown(items, 'note-check')
         });
       },
       fontsize: function (lang, options) {
@@ -5977,43 +6056,39 @@
         return tplButton(label, {
           title: lang.font.size,
           className: 'note-fontsize',
-          dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
+          dropdown: tplDropdown(items, 'note-check')
         });
       },
       color: function (lang, options) {
         var colorButtonLabel = '<i class="' +
                                   options.iconPrefix + options.icons.color.recent +
-                                '" style="color:black;background-color:yellow;"></i>',
-          colorButton = tplButton(colorButtonLabel, {
+                                '" style="color:black;background-color:yellow;"></i>';
+
+        var colorButton = tplButton(colorButtonLabel, {
           className: 'note-recent-color',
           title: lang.color.recent,
           event: 'color',
           value: '{"backColor":"yellow"}'
         });
 
-        var dropdown = '<ul class="dropdown-menu">' +
-                         '<li>' +
-                           '<div class="btn-group">' +
-                             '<div class="note-palette-title">' + lang.color.background + '</div>' +
-                             '<div class="note-color-reset" data-event="backColor"' +
-                               ' data-value="inherit" title="' + lang.color.transparent + '">' +
-                               lang.color.setTransparent +
-                             '</div>' +
-                             '<div class="note-color-palette" data-target-event="backColor"></div>' +
-                           '</div>' +
-                           '<div class="btn-group">' +
-                             '<div class="note-palette-title">' + lang.color.foreground + '</div>' +
-                             '<div class="note-color-reset" data-event="foreColor" data-value="inherit" title="' + lang.color.reset + '">' +
-                               lang.color.resetToDefault +
-                             '</div>' +
-                             '<div class="note-color-palette" data-target-event="foreColor"></div>' +
-                           '</div>' +
-                         '</li>' +
-                       '</ul>';
+        var items = [
+          '<li><div class="btn-group">',
+          '<div class="note-palette-title">' + lang.color.background + '</div>',
+          '<div class="note-color-reset" data-event="backColor"',
+          ' data-value="inherit" title="' + lang.color.transparent + '">' + lang.color.setTransparent + '</div>',
+          '<div class="note-color-palette" data-target-event="backColor"></div>',
+          '</div><div class="btn-group">',
+          '<div class="note-palette-title">' + lang.color.foreground + '</div>',
+          '<div class="note-color-reset" data-event="foreColor" data-value="inherit" title="' + lang.color.reset + '">',
+          lang.color.resetToDefault,
+          '</div>',
+          '<div class="note-color-palette" data-target-event="foreColor"></div>',
+          '</div></li>'
+        ];
 
         var moreButton = tplButton('', {
           title: lang.color.more,
-          dropdown: dropdown
+          dropdown: tplDropdown(items)
         });
 
         return colorButton + moreButton;
@@ -6099,18 +6174,17 @@
           event: 'indent'
         });
 
-        var dropdown = '<div class="dropdown-menu">' +
-                         '<div class="note-align btn-group">' +
-                           leftButton + centerButton + rightButton + justifyButton +
-                         '</div>' +
-                         '<div class="note-list btn-group">' +
-                           indentButton + outdentButton +
-                         '</div>' +
-                       '</div>';
+        var dropdown = [
+          '<div class="note-align btn-group">',
+          leftButton + centerButton + rightButton + justifyButton,
+          '</div><div class="note-list btn-group">',
+          indentButton + outdentButton,
+          '</div>'
+        ];
 
         return tplIconButton(options.iconPrefix + options.icons.paragraph.paragraph, {
           title: lang.paragraph.paragraph,
-          dropdown: dropdown
+          dropdown: tplDropdown(dropdown, '', 'div')
         });
       },
       height: function (lang, options) {
@@ -6122,7 +6196,7 @@
 
         return tplIconButton(options.iconPrefix + options.icons.font.height, {
           title: lang.font.height,
-          dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
+          dropdown: tplDropdown(items, 'note-check')
         });
 
       },
@@ -6254,13 +6328,13 @@
         var $content = $('<div />');
         for (var idx = 0, len = options.airPopover.length; idx < len; idx ++) {
           var group = options.airPopover[idx];
-          
+
           var $group = $('<div class="note-' + group[0] + ' btn-group">');
           for (var i = 0, lenGroup = group[1].length; i < lenGroup; i++) {
             var $button = $(tplButtonInfo[group[1][i]](lang, options));
 
             $button.attr('data-name', group[1][i]);
-            
+
             $group.append($button);
           }
           $content.append($group);
@@ -6270,14 +6344,14 @@
       };
 
       var $notePopover = $('<div class="note-popover" />');
-      
+
       $notePopover.append(tplLinkPopover());
       $notePopover.append(tplImagePopover());
-      
+
       if (options.airMode) {
         $notePopover.append(tplAirPopover());
       }
-      
+
       return $notePopover;
     };
 
@@ -6449,7 +6523,7 @@
                    '<div class="title">' + lang.shortcut.shortcuts + '</div>' +
                    (agent.isMac ? tplShortcutTable(lang, options) : replaceMacKeys(tplShortcutTable(lang, options))) +
                    '<p class="text-center">' +
-                     '<a href="//summernote.org/" target="_blank">Summernote 0.6.8</a> · ' +
+                     '<a href="//summernote.org/" target="_blank">Summernote 0.6.10</a> · ' +
                      '<a href="//github.com/summernote/summernote" target="_blank">Project</a> · ' +
                      '<a href="//github.com/summernote/summernote/issues" target="_blank">Issues</a>' +
                    '</p>';
@@ -6640,7 +6714,7 @@
         }
         $toolbar.append($group);
       }
-      
+
       $toolbar.prependTo($editor);
       var keyMap = options.keyMap[agent.isMac ? 'mac' : 'pc'];
       createPalette($toolbar, options);
@@ -6654,8 +6728,10 @@
       //06. handle(control selection, ...)
       $(tplHandles()).prependTo($editor);
 
+      var $dialogContainer = options.dialogsInBody ? document.body : $editor;
+
       //07. create Dialog
-      var $dialog = $(tplDialogs(langInfo, options)).prependTo($editor);
+      var $dialog = $(tplDialogs(langInfo, options)).prependTo($dialogContainer);
       $dialog.find('button.close, a.modal-close').click(function () {
         $(this).closest('.modal').modal('hide');
       });
@@ -6733,6 +6809,9 @@
       } else {
         $holder.html(layoutInfo.editable().html());
 
+        if (options.dialogsInBody) {
+          layoutInfo.dialog().remove();
+        }
         layoutInfo.editor().remove();
         $holder.show();
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: summernote-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.9.0
+  version: 0.6.10.0
 platform: ruby
 authors:
 - Hyo Seong Choi