Merge d0894e8 into d2956d7

summernote · Jul 9, 2016 · 14176a6 · 14176a6
2 parents d2956d7 + d0894e8
commit 14176a6
Show file tree

Hide file tree

Showing 72 changed files with 1,232 additions and 252 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 sudo: false
-node_js: 4.1
+node_js: 5.1
 before_script:
 - node --version
 - npm --version

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -107,7 +107,7 @@ module.exports = function (grunt) {
     },
 
     jscs: {
-      src: ['*.js', 'src/**/*.js', 'test/**/*.js'],
+      src: ['*.js', 'src/**/*.js', 'test/**/*.js', 'plugin/**/*.js'],
       gruntfile: 'Gruntfile.js',
       build: 'build'
     },
@@ -126,6 +126,13 @@ module.exports = function (grunt) {
             src: '**/*.js',
             dest: 'dist/lang',
             ext: '.min.js'
+          },
+          {
+            expand: true,
+            cwd: 'dist/plugin',
+            src: '**/*.js',
+            dest: 'dist/plugin',
+            ext: '.min.js'
           }
         ]
       }
@@ -135,9 +142,18 @@ module.exports = function (grunt) {
     recess: {
       dist: {
         options: { compile: true, compress: true },
-        files: {
-          'dist/summernote.css': ['src/less/summernote.less']
-        }
+        files: [
+          {
+            'dist/summernote.css': ['src/less/summernote.less']
+          },
+          {
+            expand: true,
+            cwd: 'dist/plugin',
+            src: '**/*.css',
+            dest: 'dist/plugin',
+            ext: '.min.css'
+          }
+        ]
       }
     },
 
@@ -160,7 +176,7 @@ module.exports = function (grunt) {
             'dist/font/*'
           ]
         }, {
-          src: ['plugin/**/*.js', 'lang/**/*.js'],
+          src: ['plugin/**/*.js', 'plugin/**/*.css', 'lang/**/*.js'],
           dest: 'dist/'
         }]
       }
@@ -245,6 +261,7 @@ module.exports = function (grunt) {
       dist: {
         files: [
           { src: 'lang/*', dest: 'dist/' },
+          { src: 'plugin/**/*', dest: 'dist/' },
           { expand: true, cwd: 'src/icons/dist/font/', src: ['**', '!*.html'], dest: 'dist/font/' },
           { src: 'src/icons/dist/summernote.css', dest: 'src/icons/dist/summernote.less' }
         ]
@@ -269,7 +286,7 @@ module.exports = function (grunt) {
   // load all grunts/*.js
   grunt.loadTasks('grunts');
 
-  // server: runt server for development
+  // server: run server for development
   grunt.registerTask('server', ['connect', 'watch']);
 
   // lint

diff --git a/MAINTAIN.md b/MAINTAIN.md
@@ -40,4 +40,5 @@ meteor/publish.sh
 ### 05. Update summernote.github.io
 Update summernote version in _config.yml.
 
-TODO...
+### 06. Update connector
+ - [summernote-rails](https://github.com/summernote/summernote-rails/blob/master/MAINTAIN.md)
diff --git a/README.md b/README.md
@@ -30,6 +30,9 @@ Summernote uses opensource libraries: [jQuery](http://jquery.com/), [Bootstrap](
 
 For [Meteor](http://github.com/meteor/meteor), just run `meteor add summernote:summernote`. More info in the [Meteor README](meteor/README.md).
 
+Also there's an adaptation for React: [react-summernote](https://github.com/Vnkitaev/react-summernote)
+
+
 For other/no frameworks:
 
 #### 1. include JS/CSS
@@ -47,7 +50,7 @@ Include the following code in the `<head>` tag of your HTML:
 <script src="summernote.js"></script>
 ```
 
-#### 2. target elements
+#### 2. target a element
 
 Then place a `div` tag somewhere in the `body` tag. This element will be replaced with the summernote editor.
 
@@ -65,6 +68,8 @@ $(document).ready(function() {
 });
 ```
 
+For more examples, please visit to [homepage](http://summernote.org/examples).
+
 ### API
 
 `code` - get the HTML source code underlying the text in the editor:
@@ -73,29 +78,12 @@ $(document).ready(function() {
 var html = $('#summernote').summernote('code');
 ```
 
-`Destroy` summernote:
-
-```javascript
-$('#summernote').summernote('destroy');
-```
+For more detail about API, please refer to [document](http://summernote.org/getting-started/#basic-api).
 
 #### Warning - code injection
 
 The code view allows the user to enter script contents. Make sure to filter/[sanitize the HTML on the server](https://github.com/search?l=JavaScript&q=sanitize+html). Otherwise, an attacker can inject arbitrary JavaScript code into clients.
 
-### Supported platforms
-
-Any modern browser: Safari, Chrome, Firefox, Opera, Internet Explorer 9+.
-
-### Upcoming Features
-* Responsive toolbar
-* Table: Handles (sizing, selection) and popover
-* IE8 Support
-* Clipboard (you can paste images already)
-* Media object selection
-
-### Developer information
-
 #### document structure
 
 ```

diff --git a/dist/lang/summernote-hr-HR.js b/dist/lang/summernote-hr-HR.js
@@ -0,0 +1,104 @@
+(function ($) {
+  $.extend($.summernote.lang, {
+    'hr-HR': {
+      font: {
+        bold: 'Podebljano',
+        italic: 'Kurziv',
+        underline: 'Podvučeno',
+        clear: 'Ukloni stilove fonta',
+        height: 'Visina linije',
+        strikethrough: 'Precrtano',
+        size: 'Veličina fonta'
+      },
+      image: {
+        image: 'Slika',
+        insert: 'Ubaci sliku',
+        resizeFull: 'Puna veličina',
+        resizeHalf: 'Umanji na 50%',
+        resizeQuarter: 'Umanji na 25%',
+        floatLeft: 'Poravnaj lijevo',
+        floatRight: 'Poravnaj desno',
+        floatNone: 'Bez poravnanja',
+        dragImageHere: 'Povuci sliku ovdje',
+        selectFromFiles: 'Izaberi iz datoteke',
+        url: 'Adresa slike',
+        remove: 'Ukloni sliku'
+      },
+      video: {
+        video: 'Video',
+        videoLink: 'Veza na video',
+        insert: 'Ubaci video',
+        url: 'URL video',
+        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion ili Youku)'
+      },
+      link: {
+        link: 'Veza',
+        insert: 'Ubaci vezu',
+        unlink: 'Ukloni vezu',
+        edit: 'Uredi',
+        textToDisplay: 'Tekst za prikaz',
+        url: 'Internet adresa',
+        openInNewWindow: 'Otvori u novom prozoru'
+      },
+      table: {
+        table: 'Tablica'
+      },
+      hr: {
+        insert: 'Ubaci horizontalnu liniju'
+      },
+      style: {
+        style: 'Stil',
+        normal: 'Normalni',
+        blockquote: 'Citat',
+        pre: 'Kôd',
+        h1: 'Naslov 1',
+        h2: 'Naslov 2',
+        h3: 'Naslov 3',
+        h4: 'Naslov 4',
+        h5: 'Naslov 5',
+        h6: 'Naslov 6'
+      },
+      lists: {
+        unordered: 'Obična lista',
+        ordered: 'Numerirana lista'
+      },
+      options: {
+        help: 'Pomoć',
+        fullscreen: 'Preko cijelog ekrana',
+        codeview: 'Izvorni kôd'
+      },
+      paragraph: {
+        paragraph: 'Paragraf',
+        outdent: 'Smanji uvlačenje',
+        indent: 'Povećaj uvlačenje',
+        left: 'Poravnaj lijevo',
+        center: 'Centrirano',
+        right: 'Poravnaj desno',
+        justify: 'Poravnaj obostrano'
+      },
+      color: {
+        recent: 'Posljednja boja',
+        more: 'Više boja',
+        background: 'Boja pozadine',
+        foreground: 'Boja teksta',
+        transparent: 'Prozirna',
+        setTransparent: 'Prozirna',
+        reset: 'Poništi',
+        resetToDefault: 'Podrazumijevana'
+      },
+      shortcut: {
+        shortcuts: 'Prečice s tipkovnice',
+        close: 'Zatvori',
+        textFormatting: 'Formatiranje teksta',
+        action: 'Akcija',
+        paragraphFormatting: 'Formatiranje paragrafa',
+        documentStyle: 'Stil dokumenta',
+        extraKeys: 'Dodatne kombinacije'
+      },
+      history: {
+        undo: 'Poništi',
+        redo: 'Ponovi'
+      }
+    }
+  });
+})(jQuery);
diff --git a/dist/lang/summernote-hr-HR.min.js b/dist/lang/summernote-hr-HR.min.js
diff --git a/issue_template.md b/issue_template.md
@@ -0,0 +1,11 @@
+#### steps to reproduce
+1.
+2.
+3.
+
+#### browser version and os version
+What is your browser and OS?
+
+#### screenshot of issue
+add screenshots which shows your issue(if needed).
+You can make [gif from Recordit](http://www.recordit.co/).
diff --git a/lang/summernote-ar-AR.js b/lang/summernote-ar-AR.js
@@ -49,7 +49,7 @@
       },
       style: {
         style: 'تنسيق',
-        normal: 'عادي',
+        p: 'عادي',
         blockquote: 'إقتباس',
         pre: 'شفيرة',
         h1: 'عنوان رئيسي 1',

diff --git a/lang/summernote-bg-BG.js b/lang/summernote-bg-BG.js
@@ -44,7 +44,7 @@
       },
       style: {
         style: 'Стил',
-        normal: 'Нормален',
+        p: 'Нормален',
         blockquote: 'Цитат',
         pre: 'Код',
         h1: 'Заглавие 1',

diff --git a/lang/summernote-ca-ES.js b/lang/summernote-ca-ES.js
@@ -39,7 +39,7 @@
         videoLink: 'Enllaç del vídeo',
         insert: 'Inserir vídeo',
         url: 'URL del vídeo?',
-        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion, o Youku)'
+        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion o Youku)'
       },
       link: {
         link: 'Enllaç',
@@ -58,7 +58,7 @@
       },
       style: {
         style: 'Estil',
-        normal: 'Normal',
+        p: 'p',
         blockquote: 'Cita',
         pre: 'Codi',
         h1: 'Títol 1',
@@ -144,4 +144,4 @@
       }
     }
   });
-})(jQuery);
+})(jQuery);
diff --git a/lang/summernote-cs-CZ.js b/lang/summernote-cs-CZ.js
@@ -47,7 +47,7 @@
       },
       style: {
         style: 'Styl',
-        normal: 'Normální',
+        p: 'Normální',
         blockquote: 'Citace',
         pre: 'Kód',
         h1: 'Nadpis 1',

diff --git a/lang/summernote-da-DK.js b/lang/summernote-da-DK.js
@@ -58,7 +58,7 @@
       },
       style: {
         style: 'Stil',
-        normal: 'Normal',
+        p: 'p',
         blockquote: 'Citat',
         pre: 'Kode',
         h1: 'Overskrift 1',

diff --git a/lang/summernote-de-DE.js b/lang/summernote-de-DE.js
@@ -35,7 +35,7 @@
         videoLink: 'Video Link',
         insert: 'Video einfügen',
         url: 'Video URL?',
-        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion, oder Youku)'
+        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion oder Youku)'
       },
       link: {
         link: 'Link',
@@ -54,7 +54,7 @@
       },
       style: {
         style: 'Stil',
-        normal: 'Normal',
+        p: 'p',
         blockquote: 'Zitat',
         pre: 'Quellcode',
         h1: 'Überschrift 1',