summernote-rails 0.6.7.0 → 0.6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c02b349b30cb6166bfedc07dce5d0acae4e3bae
-  data.tar.gz: bee6ade51443ad9daf85e2be658a1e52cdf740ea
+  metadata.gz: f5cb15d8591364b1ceb1017edf2162d29900cee9
+  data.tar.gz: 7c2d869058695740d1346e0be7fbbf424ac2a4df
 SHA512:
-  metadata.gz: 117085c2a7aa565af37a70dbc9b28eefbd0bcab17e91e1e3c10eca1c4f8ec0d536df1b5d2c487e1c283aa7c303c6bcaccaf0751740808eee8729e8db924b45d7
-  data.tar.gz: fcbbc94f20a79ba645c66177ec69cd32113a6cae2cf26b3976b37ef86efd39e1344d7113486fa740d4bee2b46ffa105e62564af5bd20f170ffa38a1ea0532cce
+  metadata.gz: f1f5990ca679cb884e949d73b2bbc8c1dc5e944f17d9e632b42e52ff90e3910051f122315685704e3345d8b139b2613282ab11e08bc61d1a09e461657a61ad4e
+  data.tar.gz: 962edc4c209758d9aee11d4a6a948163a203ebf482f2112b0bdd7394e737f7ddebf1b2a16366fc3bf1f5109d7880b03f29ca271e4b204e3b0cb5ba80f1996f8b

data/lib/summernote-rails/version.rb

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

data/vendor/assets/javascripts/summernote/locales/bg-BG.js

@@ -0,0 +1,99 @@
+(function ($) {
+  $.extend($.summernote.lang, {
+    'bg-BG': {
+      font: {
+        bold: 'Удебелен',
+        italic: 'Наклонен',
+        underline: 'Подчертан',
+        clear: 'Изчисти стиловете',
+        height: 'Височина',
+        name: 'Шрифт',
+        strikethrough: 'Задраскано',
+        subscript: 'Долен индекс',
+        superscript: 'Горен индекс',
+        size: 'Размер на шрифта'
+      },
+      image: {
+        image: 'Изображение',
+        insert: 'Постави картинка',
+        resizeFull: 'Цял размер',
+        resizeHalf: 'Размер на 50%',
+        resizeQuarter: 'Размер на 25%',
+        floatLeft: 'Подравни в ляво',
+        floatRight: 'Подравни в дясно',
+        floatNone: 'Без подравняване',
+        dragImageHere: 'Пуснете изображението тук',
+        selectFromFiles: 'Изберете файл',
+        url: 'URL адрес на изображение',
+        remove: 'Премахни изображение'
+      },
+      link: {
+        link: 'Връзка',
+        insert: 'Добави връзка',
+        unlink: 'Премахни връзка',
+        edit: 'Промени',
+        textToDisplay: 'Текст за показване',
+        url: 'URL адрес',
+        openInNewWindow: 'Отвори в нов прозорец'
+      },
+      table: {
+        table: 'Таблица'
+      },
+      hr: {
+        insert: 'Добави хоризонтална линия'
+      },
+      style: {
+        style: 'Стил',
+        normal: 'Нормален',
+        blockquote: 'Цитат',
+        pre: 'Код',
+        h1: 'Заглавие 1',
+        h2: 'Заглавие 2',
+        h3: 'Заглавие 3',
+        h4: 'Заглавие 4',
+        h5: 'Заглавие 5',
+        h6: 'Заглавие 6'
+      },
+      lists: {
+        unordered: 'Символен списък',
+        ordered: 'Цифров списък'
+      },
+      options: {
+        help: 'Помощ',
+        fullscreen: 'На цял екран',
+        codeview: 'Преглед на код'
+      },
+      paragraph: {
+        paragraph: 'Параграф',
+        outdent: 'Намаляване на отстъпа',
+        indent: 'Абзац',
+        left: 'Подравняване в ляво',
+        center: 'Център',
+        right: 'Подравняване в дясно',
+        justify: 'Разтягане по ширина'
+      },
+      color: {
+        recent: 'Последния избран цвят',
+        more: 'Още цветове',
+        background: 'Цвят на фона',
+        foreground: 'Цвят на шрифта',
+        transparent: 'Прозрачен',
+        setTransparent: 'Направете прозрачен',
+        reset: 'Възстанови',
+        resetToDefault: 'Възстанови оригиналните'
+      },
+      shortcut: {
+        shortcuts: 'Клавишни комбинации',
+        close: 'Затвори',
+        textFormatting: 'Форматиране на текста',
+        action: 'Действие',
+        paragraphFormatting: 'Форматиране на параграф',
+        documentStyle: 'Стил на документа'
+      },
+      history: {
+        undo: 'Назад',
+        redo: 'Напред'
+      }
+    }
+  });
+})(jQuery);

data/vendor/assets/javascripts/summernote/locales/fr-FR.js

@@ -10,7 +10,7 @@
         name: 'Famille de police',
         strikethrough: 'Barré',
         superscript: 'Exposant',
-        subscript: 'Indicé',
+        subscript: 'Indice',
         size: 'Taille de police'
       },
       image: {
@@ -22,8 +22,15 @@
         floatLeft: 'Aligné à gauche',
         floatRight: 'Aligné à droite',
         floatNone: 'Pas d\'alignement',
-        dragImageHere: 'Faites glisser une image avec la souris dans ce cadre',
+        shapeRounded: 'Forme: Rectangle arrondie',
+        shapeCircle: 'Forme: Cercle',
+        shapeThumbnail: 'Forme: Vignette',
+        shapeNone: 'Forme: Aucune',
+        dragImageHere: 'Faites glisser une image ou un texte dans ce cadre',
+        dropImage: 'Lachez l\'image ou le texte',
         selectFromFiles: 'Choisir un fichier',
+        maximumFileSize: 'Taille de fichier maximale',
+        maximumFileSizeError: 'Taille maximale du fichier dépassée',
         url: 'URL de l\'image',
         remove: 'Supprimer l\'image'
       },
@@ -40,7 +47,7 @@
         table: 'Tableau'
       },
       hr: {
-        insert: 'Insérer une ligne horizontale de séparation'
+        insert: 'Insérer une ligne horizontale'
       },
       style: {
         style: 'Style',
@@ -88,7 +95,8 @@
         textFormatting: 'Mise en forme du texte',
         action: 'Action',
         paragraphFormatting: 'Mise en forme des paragraphes',
-        documentStyle: 'Style du document'
+        documentStyle: 'Style du document',
+        extraKeys: 'Touches supplémentaires'
       },
       history: {
         undo: 'Annuler la dernière action',

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

@@ -26,29 +26,29 @@
      * @property {Function} buttons.helloImage   function to make button
      */
     buttons: { // buttons
-      hello: function () {
+      hello: function (lang, options) {
 
-        return tmpl.iconButton('fa fa-header', {
+        return tmpl.iconButton(options.iconPrefix + 'header', {
           event : 'hello',
           title: 'hello',
           hide: true
         });
       },
-      helloDropdown: function () {
+      helloDropdown: function (lang, options) {
 
 
         var list = '<li><a data-event="helloDropdown" href="#" data-value="summernote">summernote</a></li>';
         list += '<li><a data-event="helloDropdown" href="#" data-value="codemirror">Code Mirror</a></li>';
         var dropdown = '<ul class="dropdown-menu">' + list + '</ul>';
 
-        return tmpl.iconButton('fa fa-header', {
+        return tmpl.iconButton(options.iconPrefix + 'header', {
           title: 'hello',
           hide: true,
           dropdown : dropdown
         });
       },
-      helloImage : function () {
-        return tmpl.iconButton('fa fa-file-image-o', {
+      helloImage : function (lang, options) {
+        return tmpl.iconButton(options.iconPrefix + 'file-image-o', {
           event : 'helloImage',
           title: 'helloImage',
           hide: true

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

@@ -40,7 +40,7 @@
     var dmRegExp = /.+dailymotion.com\/(video|hub)\/([^_]+)[^#]*(#video=([^_&]+))?/;
     var dmMatch = url.match(dmRegExp);
 
-    var youkuRegExp = /\/\/v\.youku\.com\/v_show\/id_(\w+)\.html/;
+    var youkuRegExp = /\/\/v\.youku\.com\/v_show\/id_(\w+)=*\.html/;
     var youkuMatch = url.match(youkuRegExp);
 
     var mp4RegExp = /^.+.(mp4|m4v)$/;
@@ -204,8 +204,8 @@
      * @property {function(object): string} buttons.video
      */
     buttons: {
-      video: function (lang) {
-        return tmpl.iconButton('fa fa-youtube-play', {
+      video: function (lang, options) {
+        return tmpl.iconButton(options.iconPrefix + 'youtube-play', {
           event: 'showVideoDialog',
           title: lang.video.video,
           hide: true

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

@@ -1,12 +1,12 @@
 /**
- * Super simple wysiwyg editor on Bootstrap v0.6.7
+ * Super simple wysiwyg editor on Bootstrap v0.6.8
  * http://summernote.org/
  *
  * summernote.js
  * Copyright 2013-2015 Alan Hong. and other contributors
  * summernote may be freely distributed under the MIT license./
  *
- * Date: 2015-05-17T06:58Z
+ * Date: 2015-06-21T11:34Z
  */
 (function (factory) {
   /* global define */
@@ -2271,7 +2271,7 @@
    */
   var defaults = {
     /** @property */
-    version: '0.6.7',
+    version: '0.6.8',
 
     /**
      * 
@@ -2320,6 +2320,72 @@
 
       iconPrefix: 'fa fa-',         // prefix for css icon classes
 
+      icons: {
+        font: {
+          bold: 'bold',
+          italic: 'italic',
+          underline: 'underline',
+          clear: 'eraser',
+          height: 'text-height',
+          strikethrough: 'strikethrough',
+          superscript: 'superscript',
+          subscript: 'subscript'
+        },
+        image: {
+          image: 'picture-o',
+          floatLeft: 'align-left',
+          floatRight: 'align-right',
+          floatNone: 'align-justify',
+          shapeRounded: 'square',
+          shapeCircle: 'circle-o',
+          shapeThumbnail: 'picture-o',
+          shapeNone: 'times',
+          remove: 'trash-o'
+        },
+        link: {
+          link: 'link',
+          unlink: 'unlink',
+          edit: 'edit'
+        },
+        table: {
+          table: 'table'
+        },
+        hr: {
+          insert: 'minus'
+        },
+        style: {
+          style: 'magic'
+        },
+        lists: {
+          unordered: 'list-ul',
+          ordered: 'list-ol'
+        },
+        options: {
+          help: 'question',
+          fullscreen: 'arrows-alt',
+          codeview: 'code'
+        },
+        paragraph: {
+          paragraph: 'align-left',
+          outdent: 'outdent',
+          indent: 'indent',
+          left: 'align-left',
+          center: 'align-center',
+          right: 'align-right',
+          justify: 'align-justify'
+        },
+        color: {
+          recent: 'font'
+        },
+        history: {
+          undo: 'undo',
+          redo: 'repeat'
+        },
+        misc: {
+          check: 'check'
+        }
+      },
+
       codemirror: {                 // codemirror options
         mode: 'text/html',
         htmlMode: true,
@@ -2430,8 +2496,6 @@
       onCreateLink: function (sLinkUrl) {
         if (sLinkUrl.indexOf('@') !== -1 && sLinkUrl.indexOf(':') === -1) {
           sLinkUrl =  'mailto:' + sLinkUrl;
-        } else if (sLinkUrl.indexOf('://') === -1) {
-          sLinkUrl = 'http://' + sLinkUrl;
         }
 
         return sLinkUrl;
@@ -3852,7 +3916,7 @@
      * @param {jQuery} $editable
      */
     this.unlink = function ($editable) {
-      var rng = this.createRange();
+      var rng = this.createRange($editable);
       if (rng.isOnAnchor()) {
         var anchor = dom.ancestor(rng.sc, dom.isAnchor);
         rng = range.createFromNode(anchor);
@@ -4088,6 +4152,16 @@
              .select();
       }
     };
+
+    /**
+     * returns whether contents is empty or not.
+     *
+     * @param {jQuery} $editable
+     * @return {Boolean}
+     */
+    this.isEmpty = function ($editable) {
+      return dom.isEmpty($editable[0]) || dom.emptyPara === $editable.html();
+    };
   };
 
   /**
@@ -4837,25 +4911,29 @@
 
       // attach dropImage
       $dropzone.on('drop', function (event) {
-        event.preventDefault();
 
         var dataTransfer = event.originalEvent.dataTransfer;
-        var html = dataTransfer.getData('text/html');
-        var text = dataTransfer.getData('text/plain');
-
         var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
 
         if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+          event.preventDefault();
           layoutInfo.editable().focus();
           handler.insertImages(layoutInfo, dataTransfer.files);
-        } else if (html) {
-          $(html).each(function () {
-            layoutInfo.editable().focus();
-            handler.invoke('editor.insertNode', layoutInfo.editable(), this);
-          });
-        } else if (text) {
-          layoutInfo.editable().focus();
-          handler.invoke('editor.insertText', layoutInfo.editable(), text);
+        } else {
+          var insertNodefunc = function () {
+            layoutInfo.holder().summernote('insertNode', this);
+          };
+
+          for (var i = 0, len = dataTransfer.types.length; i < len; i++) {
+            var type = dataTransfer.types[i];
+            var content = dataTransfer.getData(type);
+
+            if (type.toLowerCase().indexOf('text') > -1) {
+              layoutInfo.holder().summernote('pasteHTML', content);
+            } else {
+              $(content).each(insertNodefunc);
+            }
+          }
         }
       }).on('dragover', false); // prevent default dragover event
     };
@@ -4863,7 +4941,29 @@
 
   var Clipboard = function (handler) {
 
+    var $paste;
+
     this.attach = function (layoutInfo) {
+
+      if (window.clipboardData || agent.isFF) {
+        $paste = $('<div />').attr('contenteditable', true).css({
+          position : 'absolute',
+          left : -100000,
+          'opacity' : 0
+        });
+        layoutInfo.editable().after($paste);
+        $paste.one('paste', hPasteClipboardImage);
+        
+        layoutInfo.editable().on('keydown', function (e) {
+          if (e.ctrlKey && e.keyCode === 86) {  // CTRL+V
+            handler.invoke('saveRange', layoutInfo.editable());
+            if ($paste) {
+              $paste.focus();
+            }
+          }
+        });
+      }
+
       layoutInfo.editable().on('paste', hPasteClipboardImage);
     };
 
@@ -4873,58 +4973,49 @@
      * @param {Event} event
      */
     var hPasteClipboardImage = function (event) {
+
       var clipboardData = event.originalEvent.clipboardData;
       var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
       var $editable = layoutInfo.editable();
 
       if (!clipboardData || !clipboardData.items || !clipboardData.items.length) {
+
         var callbacks = $editable.data('callbacks');
         // only can run if it has onImageUpload method
         if (!callbacks.onImageUpload) {
           return;
         }
 
-        // save cursor
-        handler.invoke('editor.saveNode', $editable);
-        handler.invoke('editor.saveRange', $editable);
-
-        $editable.html('');
-
         setTimeout(function () {
-          var $img = $editable.find('img');
-
-          // if img is no in clipboard, insert text or dom
-          if (!$img.length || $img[0].src.indexOf('data:') === -1) {
-            var html = $editable.html();
-
-            handler.invoke('editor.restoreNode', $editable);
-            handler.invoke('editor.restoreRange', $editable);
+          if (!$paste) {
+            return;
+          }
 
-            handler.invoke('editor.focus', $editable);
-            try {
-              handler.invoke('editor.pasteHTML', $editable, html);
-            } catch (ex) {
-              handler.invoke('editor.insertText', $editable, html);
-            }
+          var imgNode = $paste[0].firstChild;
+          if (!imgNode) {
             return;
           }
 
-          var datauri = $img[0].src;
+          handler.invoke('restoreRange', $editable);
+          if (!dom.isImg(imgNode)) {
+            handler.invoke('pasteHTML', $editable, $paste.html());
+          } else {
+            var datauri = imgNode.src;
+
+            var data = atob(datauri.split(',')[1]);
+            var array = new Uint8Array(data.length);
+            for (var i = 0; i < data.length; i++) {
+              array[i] = data.charCodeAt(i);
+            }
 
-          var data = atob(datauri.split(',')[1]);
-          var array = new Uint8Array(data.length);
-          for (var i = 0; i < data.length; i++) {
-            array[i] = data.charCodeAt(i);
+            var blob = new Blob([array], { type : 'image/png' });
+            blob.name = 'clipboard.png';
+            handler.invoke('focus', $editable);
+            handler.insertImages(layoutInfo, [blob]);
           }
 
-          var blob = new Blob([array], { type : 'image/png' });
-          blob.name = 'clipboard.png';
+          $paste.remove();
 
-          handler.invoke('editor.restoreNode', $editable);
-          handler.invoke('editor.restoreRange', $editable);
-          handler.insertImages(layoutInfo, [blob]);
-
-          handler.invoke('editor.afterCommand', $editable);
         }, 0);
 
         return;
@@ -4999,7 +5090,7 @@
 
           // if no url was given, copy text to url
           if (!linkInfo.url) {
-            linkInfo.url = linkInfo.text;
+            linkInfo.url = linkInfo.text || 'http://';
             toggleBtn($linkBtn, linkInfo.text);
           }
 
@@ -5378,7 +5469,7 @@
       }, 0);
     };
 
-    var hScrollAndBlur = function (event) {
+    var hScroll = function (event) {
       var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
       //hide popover and handle when scrolled
       modules.popover.hide(layoutInfo.popover());
@@ -5548,7 +5639,7 @@
       }
       layoutInfo.editable().on('mousedown', hMousedown);
       layoutInfo.editable().on('keyup mouseup', hKeyupAndMouseup);
-      layoutInfo.editable().on('scroll blur', hScrollAndBlur);
+      layoutInfo.editable().on('scroll', hScroll);
 
       // handler for clipboard
       modules.clipboard.attach(layoutInfo, options);
@@ -5613,7 +5704,8 @@
         onChange: options.onChange,
         onImageUpload: options.onImageUpload,
         onImageUploadError: options.onImageUploadError,
-        onMediaDelete : options.onMediaDelete
+        onMediaDelete: options.onMediaDelete,
+        onToolbarClick: options.onToolbarClick
       });
 
       // Textarea: auto filling the code before form submit.
@@ -5726,9 +5818,11 @@
       var dropdown = options.dropdown;
       var hide = options.hide;
 
-      return '<button type="button"' +
+      return (dropdown ? '<div class="btn-group' +
+               (className ? ' ' + className : '') + '">' : '') +
+               '<button type="button"' +
                  ' class="btn btn-default btn-sm btn-small' +
-                   (className ? ' ' + className : '') +
+                   ((!dropdown && className) ? ' ' + className : '') +
                    (dropdown ? ' dropdown-toggle' : '') +
                  '"' +
                  (dropdown ? ' data-toggle="dropdown"' : '') +
@@ -5737,10 +5831,11 @@
                  (value ? ' data-value=\'' + value + '\'' : '') +
                  (hide ? ' data-hide=\'' + hide + '\'' : '') +
                  ' tabindex="-1">' +
-               label +
-               (dropdown ? ' <span class="caret"></span>' : '') +
-             '</button>' +
-             (dropdown || '');
+                 label +
+                 (dropdown ? ' <span class="caret"></span>' : '') +
+               '</button>' +
+               (dropdown || '') +
+             (dropdown ? '</div>' : '');
     };
 
     /**
@@ -5804,14 +5899,14 @@
 
     var tplButtonInfo = {
       picture: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'picture-o', {
+        return tplIconButton(options.iconPrefix + options.icons.image.image, {
           event: 'showImageDialog',
           title: lang.image.image,
           hide: true
         });
       },
       link: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'link', {
+        return tplIconButton(options.iconPrefix + options.icons.link.link, {
           event: 'showLinkDialog',
           title: lang.link.link,
           hide: true
@@ -5826,7 +5921,7 @@
                          '</div>' +
                          '<div class="note-dimension-display"> 1 x 1 </div>' +
                        '</ul>';
-        return tplIconButton(options.iconPrefix + 'table', {
+        return tplIconButton(options.iconPrefix + options.icons.table.table, {
           title: lang.table.table,
           dropdown: dropdown
         });
@@ -5842,7 +5937,7 @@
                  '</a></li>';
         }, '');
 
-        return tplIconButton(options.iconPrefix + 'magic', {
+        return tplIconButton(options.iconPrefix + options.icons.style.style, {
           title: lang.style.style,
           dropdown: '<ul class="dropdown-menu">' + items + '</ul>'
         });
@@ -5855,7 +5950,7 @@
           }
           realFontList.push(v);
           return memo + '<li><a data-event="fontName" href="#" data-value="' + v + '" style="font-family:\'' + v + '\'">' +
-                          '<i class="' + options.iconPrefix + 'check"></i> ' + v +
+                          '<i class="' + options.iconPrefix + options.icons.misc.check + '"></i> ' + v +
                         '</a></li>';
         }, '');
 
@@ -5867,25 +5962,29 @@
                      '</span>';
         return tplButton(label, {
           title: lang.font.name,
+          className: 'note-fontname',
           dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
         });
       },
       fontsize: function (lang, options) {
         var items = options.fontSizes.reduce(function (memo, v) {
           return memo + '<li><a data-event="fontSize" href="#" data-value="' + v + '">' +
-                          '<i class="fa fa-check"></i> ' + v +
+                          '<i class="' + options.iconPrefix + options.icons.misc.check + '"></i> ' + v +
                         '</a></li>';
         }, '');
 
         var label = '<span class="note-current-fontsize">11</span>';
         return tplButton(label, {
           title: lang.font.size,
+          className: 'note-fontsize',
           dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
         });
       },
       color: function (lang, options) {
-        var colorButtonLabel = '<i class="' + options.iconPrefix + 'font" style="color:black;background-color:yellow;"></i>';
-        var colorButton = tplButton(colorButtonLabel, {
+        var colorButtonLabel = '<i class="' +
+                                  options.iconPrefix + options.icons.color.recent +
+                                '" style="color:black;background-color:yellow;"></i>',
+          colorButton = tplButton(colorButtonLabel, {
           className: 'note-recent-color',
           title: lang.color.recent,
           event: 'color',
@@ -5920,82 +6019,82 @@
         return colorButton + moreButton;
       },
       bold: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'bold', {
+        return tplIconButton(options.iconPrefix + options.icons.font.bold, {
           event: 'bold',
           title: lang.font.bold
         });
       },
       italic: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'italic', {
+        return tplIconButton(options.iconPrefix + options.icons.font.italic, {
           event: 'italic',
           title: lang.font.italic
         });
       },
       underline: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'underline', {
+        return tplIconButton(options.iconPrefix + options.icons.font.underline, {
           event: 'underline',
           title: lang.font.underline
         });
       },
-      strikethrough: function (lang) {
-        return tplIconButton('fa fa-strikethrough', {
+      strikethrough: function (lang, options) {
+        return tplIconButton(options.iconPrefix + options.icons.font.strikethrough, {
           event: 'strikethrough',
           title: lang.font.strikethrough
         });
       },
-      superscript: function (lang) {
-        return tplIconButton('fa fa-superscript', {
+      superscript: function (lang, options) {
+        return tplIconButton(options.iconPrefix + options.icons.font.superscript, {
           event: 'superscript',
           title: lang.font.superscript
         });
       },
-      subscript: function (lang) {
-        return tplIconButton('fa fa-subscript', {
+      subscript: function (lang, options) {
+        return tplIconButton(options.iconPrefix + options.icons.font.subscript, {
           event: 'subscript',
           title: lang.font.subscript
         });
       },
       clear: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'eraser', {
+        return tplIconButton(options.iconPrefix + options.icons.font.clear, {
           event: 'removeFormat',
           title: lang.font.clear
         });
       },
       ul: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'list-ul', {
+        return tplIconButton(options.iconPrefix + options.icons.lists.unordered, {
           event: 'insertUnorderedList',
           title: lang.lists.unordered
         });
       },
       ol: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'list-ol', {
+        return tplIconButton(options.iconPrefix + options.icons.lists.ordered, {
           event: 'insertOrderedList',
           title: lang.lists.ordered
         });
       },
       paragraph: function (lang, options) {
-        var leftButton = tplIconButton(options.iconPrefix + 'align-left', {
+        var leftButton = tplIconButton(options.iconPrefix + options.icons.paragraph.left, {
           title: lang.paragraph.left,
           event: 'justifyLeft'
         });
-        var centerButton = tplIconButton(options.iconPrefix + 'align-center', {
+        var centerButton = tplIconButton(options.iconPrefix + options.icons.paragraph.center, {
           title: lang.paragraph.center,
           event: 'justifyCenter'
         });
-        var rightButton = tplIconButton(options.iconPrefix + 'align-right', {
+        var rightButton = tplIconButton(options.iconPrefix + options.icons.paragraph.right, {
           title: lang.paragraph.right,
           event: 'justifyRight'
         });
-        var justifyButton = tplIconButton(options.iconPrefix + 'align-justify', {
+        var justifyButton = tplIconButton(options.iconPrefix + options.icons.paragraph.justify, {
           title: lang.paragraph.justify,
           event: 'justifyFull'
         });
 
-        var outdentButton = tplIconButton(options.iconPrefix + 'outdent', {
+        var outdentButton = tplIconButton(options.iconPrefix + options.icons.paragraph.outdent, {
           title: lang.paragraph.outdent,
           event: 'outdent'
         });
-        var indentButton = tplIconButton(options.iconPrefix + 'indent', {
+        var indentButton = tplIconButton(options.iconPrefix + options.icons.paragraph.indent, {
           title: lang.paragraph.indent,
           event: 'indent'
         });
@@ -6009,7 +6108,7 @@
                          '</div>' +
                        '</div>';
 
-        return tplIconButton(options.iconPrefix + 'align-left', {
+        return tplIconButton(options.iconPrefix + options.icons.paragraph.paragraph, {
           title: lang.paragraph.paragraph,
           dropdown: dropdown
         });
@@ -6017,49 +6116,49 @@
       height: function (lang, options) {
         var items = options.lineHeights.reduce(function (memo, v) {
           return memo + '<li><a data-event="lineHeight" href="#" data-value="' + parseFloat(v) + '">' +
-                          '<i class="' + options.iconPrefix + 'check"></i> ' + v +
+                          '<i class="' + options.iconPrefix + options.icons.misc.check + '"></i> ' + v +
                         '</a></li>';
         }, '');
 
-        return tplIconButton(options.iconPrefix + 'text-height', {
+        return tplIconButton(options.iconPrefix + options.icons.font.height, {
           title: lang.font.height,
           dropdown: '<ul class="dropdown-menu note-check">' + items + '</ul>'
         });
 
       },
       help: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'question', {
+        return tplIconButton(options.iconPrefix + options.icons.options.help, {
           event: 'showHelpDialog',
           title: lang.options.help,
           hide: true
         });
       },
       fullscreen: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'arrows-alt', {
+        return tplIconButton(options.iconPrefix + options.icons.options.fullscreen, {
           event: 'fullscreen',
           title: lang.options.fullscreen
         });
       },
       codeview: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'code', {
+        return tplIconButton(options.iconPrefix + options.icons.options.codeview, {
           event: 'codeview',
           title: lang.options.codeview
         });
       },
       undo: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'undo', {
+        return tplIconButton(options.iconPrefix + options.icons.history.undo, {
           event: 'undo',
           title: lang.history.undo
         });
       },
       redo: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'repeat', {
+        return tplIconButton(options.iconPrefix + options.icons.history.redo, {
           event: 'redo',
           title: lang.history.redo
         });
       },
       hr: function (lang, options) {
-        return tplIconButton(options.iconPrefix + 'minus', {
+        return tplIconButton(options.iconPrefix + options.icons.hr.insert, {
           event: 'insertHorizontalRule',
           title: lang.hr.insert
         });
@@ -6068,12 +6167,12 @@
 
     var tplPopovers = function (lang, options) {
       var tplLinkPopover = function () {
-        var linkButton = tplIconButton(options.iconPrefix + 'edit', {
+        var linkButton = tplIconButton(options.iconPrefix + options.icons.link.edit, {
           title: lang.link.edit,
           event: 'showLinkDialog',
           hide: true
         });
-        var unlinkButton = tplIconButton(options.iconPrefix + 'unlink', {
+        var unlinkButton = tplIconButton(options.iconPrefix + options.icons.link.unlink, {
           title: lang.link.unlink,
           event: 'unlink'
         });
@@ -6101,44 +6200,44 @@
           value: '0.25'
         });
 
-        var leftButton = tplIconButton(options.iconPrefix + 'align-left', {
+        var leftButton = tplIconButton(options.iconPrefix + options.icons.image.floatLeft, {
           title: lang.image.floatLeft,
           event: 'floatMe',
           value: 'left'
         });
-        var rightButton = tplIconButton(options.iconPrefix + 'align-right', {
+        var rightButton = tplIconButton(options.iconPrefix + options.icons.image.floatRight, {
           title: lang.image.floatRight,
           event: 'floatMe',
           value: 'right'
         });
-        var justifyButton = tplIconButton(options.iconPrefix + 'align-justify', {
+        var justifyButton = tplIconButton(options.iconPrefix + options.icons.image.floatNone, {
           title: lang.image.floatNone,
           event: 'floatMe',
           value: 'none'
         });
 
-        var roundedButton = tplIconButton(options.iconPrefix + 'square', {
+        var roundedButton = tplIconButton(options.iconPrefix + options.icons.image.shapeRounded, {
           title: lang.image.shapeRounded,
           event: 'imageShape',
           value: 'img-rounded'
         });
-        var circleButton = tplIconButton(options.iconPrefix + 'circle-o', {
+        var circleButton = tplIconButton(options.iconPrefix + options.icons.image.shapeCircle, {
           title: lang.image.shapeCircle,
           event: 'imageShape',
           value: 'img-circle'
         });
-        var thumbnailButton = tplIconButton(options.iconPrefix + 'picture-o', {
+        var thumbnailButton = tplIconButton(options.iconPrefix + options.icons.image.shapeThumbnail, {
           title: lang.image.shapeThumbnail,
           event: 'imageShape',
           value: 'img-thumbnail'
         });
-        var noneButton = tplIconButton(options.iconPrefix + 'times', {
+        var noneButton = tplIconButton(options.iconPrefix + options.icons.image.shapeNone, {
           title: lang.image.shapeNone,
           event: 'imageShape',
           value: ''
         });
 
-        var removeButton = tplIconButton(options.iconPrefix + 'trash-o', {
+        var removeButton = tplIconButton(options.iconPrefix + options.icons.image.remove, {
           title: lang.image.remove,
           event: 'removeMedia',
           value: 'none'
@@ -6332,7 +6431,7 @@
                    '</div>' +
                    '<div class="form-group row-fluid">' +
                      '<label>' + lang.link.url + '</label>' +
-                     '<input class="note-link-url form-control span12" type="text" />' +
+                     '<input class="note-link-url form-control span12" type="text" value="http://" />' +
                    '</div>' +
                    (!options.disableLinkTarget ?
                      '<div class="checkbox">' +
@@ -6350,7 +6449,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.7</a> · ' +
+                     '<a href="//summernote.org/" target="_blank">Summernote 0.6.8</a> · ' +
                      '<a href="//github.com/summernote/summernote" target="_blank">Project</a> · ' +
                      '<a href="//github.com/summernote/summernote/issues" target="_blank">Issues</a>' +
                    '</p>';
@@ -6755,7 +6854,7 @@
    *        // "hello"  is button's namespace.      
    *        "hello" : function(lang, options) {
    *            // make icon button by template function          
-   *            return tmpl.iconButton('fa fa-header', {
+   *            return tmpl.iconButton(options.iconPrefix + 'header', {
    *                // callback function name when button clicked 
    *                event : 'hello',
    *                // set data-value property                 
@@ -6859,6 +6958,7 @@
       var options = hasInitOptions ? list.head(arguments) : {};
 
       options = $.extend({}, $.summernote.options, options);
+      options.icons = $.extend({}, $.summernote.options.icons, options.icons);
 
       // Include langInfo in options for later use, e.g. for image drag-n-drop
       // Setup language info with en-US as default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: summernote-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.7.0
+  version: 0.6.9.0
 platform: ruby
 authors:
 - Hyo Seong Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -68,6 +68,7 @@ files:
 - lib/summernote-rails/version.rb
 - vendor/assets/javascripts/summernote/index.js
 - vendor/assets/javascripts/summernote/locales/ar-AR.js
+- vendor/assets/javascripts/summernote/locales/bg-BG.js
 - vendor/assets/javascripts/summernote/locales/ca-ES.js
 - vendor/assets/javascripts/summernote/locales/cs-CZ.js
 - vendor/assets/javascripts/summernote/locales/da-DK.js