Merge remote-tracking branch 'upstream/master'

Author: nleush

.gitignore

@@ -7,3 +7,6 @@ examples/uploads/*
 server.js
 .tm_properties
 .project
+reports
+.grunt/
+_SpecRunner.html

.jshintrc

@@ -1,4 +1,8 @@
 {
+    "globals": {
+        "MediumEditor": true
+    },
+
     "predef": {
         "jQuery": false,
         "document": false,
@@ -11,7 +15,16 @@
         "start": false,
         "sinon": false,
         "alert": false,
-        "FB": false
+        "FB": false,
+        "describe": false,
+        "it": false,
+        "expect": false,
+        "beforeEach": false,
+        "afterEach": false,
+        "jasmine": false,
+        "spyOn": false,
+        "placeCaret": false,
+        "require": false
     },
 
     "jquery" : true,
@@ -35,4 +48,4 @@
     "sub": true,
     "strict": false,
     "unused": true
-}
+}

CHANGES.md

@@ -1,4 +1,53 @@
 
+2.2.1 / 2016-02-05
+==================
+
+  * Fix when `uploadCompleted()` is called - wait until uploaded image replaces preview
+  * Fix uploading high quality images
+  * Fix bug when an image toolbar action effects all instances of the editor (when using multiple editors on the same page)
+
+2.2.0 / 2016-01-11
+==================
+
+  * Add ```fileDeleteOptions``` option to images
+
+2.1.1 / 2015-11-23
+==================
+
+  * Fix context for sorting function
+  * Add support for editor's ```elementsContainer``` option
+
+2.1.0 / 2015-10-27
+==================
+
+  * Add support for ```editableInput``` event
+  * Add support for textarea
+  * Add ```deleteMethod``` option
+
+2.0.1 / 2015-06-11
+==================
+
+  * Fix ```hideButtons``` function
+
+2.0.0 / 2015-06-09
+==================
+
+  * **This version works for MediumEditor ```v4.12.0``` and up, because in ```v4.12.0``` MediumEditor changed the way to retrieve extension**
+  * Remove deprecated images options: ```uploadScript``` and ```formData```. Use ```fileUploadOptions``` instead.
+  * Add ```video-vimeo``` and ```video-youtube``` classes to embedded videos to allow css customization
+
+1.7.0 / 2015-05-11
+==================
+
+  * Version bump to 1.7.0, because 1.6.2 added file type and size validation which should cause a minor version bump, not only a patch
+
+1.6.2 / 2015-05-11
+==================
+
+  * Fix file type and file size validation
+  * Add a rotate animation on button
+  * Speed up Travis build
+
 1.6.1 / 2015-04-30
 ==================
 

Gruntfile.js

@@ -1,4 +1,4 @@
-module.exports = function(grunt) {
+module.exports = function (grunt) {
     // show elapsed time at the end
     require('time-grunt')(grunt);
     // load grunt tasks just in time
@@ -34,15 +34,37 @@ module.exports = function(grunt) {
             options: {
                 jshintrc: true
             },
-            files: ['src/js/*.js', '!src/js/templates.js', 'test/*.js']
+            files: ['src/js/*.js', '!src/js/templates.js', 'spec/*.js']
         },
 
-        blanket_qunit: {
-          options: {
-              urls: ['test.html?coverage=true&gruntReport'],
-              threshold: 70
-          },
-          unit: {}
+        jasmine: {
+            suite: {
+                src: 'src/js/*.js',
+                options: {
+                    specs: ['spec/*.spec.js'],
+                    helpers: 'spec/helpers/*.js',
+                    vendor: [
+                        'bower_components/jquery/dist/jquery.min.js',
+                        'bower_components/medium-editor/dist/js/medium-editor.min.js',
+                        'bower_components/handlebars/handlebars.runtime.min.js',
+                        'bower_components/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
+                        'bower_components/blueimp-file-upload/js/jquery.iframe-transport.js',
+                        'bower_components/blueimp-file-upload/js/jquery.fileupload.js',
+                        'bower_components/jquery-sortable/source/js/jquery-sortable-min.js'
+                    ],
+                    template: require('grunt-template-jasmine-istanbul'),
+                    templateOptions: {
+                        coverage: 'reports/jasmine/coverage.json',
+                        report: [{
+                            type: 'lcov',
+                            options: {
+                                dir: 'reports/jasmine/lcov'
+                            }
+                        }]
+                    },
+                    summary: true
+                }
+            }
         },
 
         sass: {
@@ -121,7 +143,7 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('test', ['jshint', 'blanket_qunit']);
+    grunt.registerTask('test', ['jshint', 'jasmine']);
     grunt.registerTask('js', ['test', 'handlebars', 'uglify', 'concat']);
     grunt.registerTask('css', ['sass', 'autoprefixer', 'csso', 'usebanner']);
     grunt.registerTask('default', ['js', 'css']);

README.md

@@ -1,12 +1,12 @@
 # jQuery insert plugin for MediumEditor
 
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/orthes/medium-editor-insert-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Build Status](https://travis-ci.org/orthes/medium-editor-insert-plugin.png)](https://travis-ci.org/orthes/medium-editor-insert-plugin)
 [![Dependency Status](http://www.versioneye.com/user/projects/53f742dce09da3467d000389/badge.svg?style=flat)](http://www.versioneye.com/user/projects/53f742dce09da3467d000389)
 [![Dependency Status](http://www.versioneye.com/user/projects/53f742e2e09da3dca800038f/badge.svg?style=flat)](http://www.versioneye.com/user/projects/53f742e2e09da3dca800038f)
 [![Codacy Badge](https://www.codacy.com/project/badge/1f8565ed2e554e4fa952ec4da6a2080b)](https://www.codacy.com/public/orthes/mediumeditorinsertplugin)
-[![Stories in Ready](https://badge.waffle.io/orthes/medium-editor-insert-plugin.svg?label=ready&title=Ready)](http://waffle.io/orthes/medium-editor-insert-plugin)
 
-This plugin expands capabilities of [MediumEditor](https://github.com/daviferreira/medium-editor) (a clone of medium.com WYSIWYG editor) and it enables users to insert into the editor various types of content (depending on available addons).
+This plugin expands capabilities of [MediumEditor](https://github.com/yabwe/medium-editor) (a clone of medium.com WYSIWYG editor) and it enables users to insert into the editor various types of content (depending on available addons).
 
 Current available addons:
 
@@ -21,7 +21,7 @@ Current available addons:
 
 ## Download
 
-* Bower (recommended): ```bower install medium-editor-insert-plugin#^1.0 --save```
+* Bower (recommended): ```bower install medium-editor-insert-plugin#^2.1 --save```
 * Manual: [Download the latest release](https://github.com/orthes/medium-editor-insert-plugin/releases)
 
 
@@ -69,11 +69,11 @@ $(function () {
 
 ## [Documentation](https://github.com/orthes/medium-editor-insert-plugin/wiki)
 
-- [Getting Started](https://github.com/orthes/medium-editor-insert-plugin/wiki/v1.0-Getting-Started)
-- [Configuration](https://github.com/orthes/medium-editor-insert-plugin/wiki/v1.0-Configuration)
-- [Server response](https://github.com/orthes/medium-editor-insert-plugin/wiki/Server-response)
-- [Custom addons](https://github.com/orthes/medium-editor-insert-plugin/wiki/v1.0-Custom-addons)
-- [Upgrading from v0.3](https://github.com/orthes/medium-editor-insert-plugin/wiki/v1.0-Upgrading-from-v0.3)
+- [Getting Started](https://github.com/orthes/medium-editor-insert-plugin/wiki/v2.x-Getting-Started)
+- [Configuration](https://github.com/orthes/medium-editor-insert-plugin/wiki/v2.x-Configuration)
+- [Server response](https://github.com/orthes/medium-editor-insert-plugin/wiki/v2.x-Server-response)
+- [Custom addons](https://github.com/orthes/medium-editor-insert-plugin/wiki/v2.x-Custom-addons)
+- [Upgrading from v0.3](https://github.com/orthes/medium-editor-insert-plugin/wiki/v2.x-Upgrading-from-v0.3)
 - [Versioning](https://github.com/orthes/medium-editor-insert-plugin/wiki/Versioning)
 - [Development & Contributing](https://github.com/orthes/medium-editor-insert-plugin/wiki/Development-&-Contributing)
 - [License](https://github.com/orthes/medium-editor-insert-plugin/wiki/License)
@@ -82,6 +82,6 @@ $(function () {
 
 ## Sponsors
 
-[creator5](http://www.creator5.com) | [Maker](http://maker.me) | [Nusii](http://nusii.com)
+[creator5](http://www.creator5.com) | [Maker](https://maker.me/) | [Nusii](http://nusii.com)
 -------- | ----- | -----
-[![creator5](http://i.imgur.com/K9uiIuT.png)](http://www.creator5.com) | [![Maker](http://i.imgur.com/8t8wsM8.png)](http://maker.me) | [![nusii](http://i.imgur.com/tvdJ249.png)](http://nusii.com)
+[![creator5](http://i.imgur.com/K9uiIuT.png)](http://www.creator5.com) | [![Maker](http://i.imgur.com/8t8wsM8.png)](http://maker.me) | [![nusii](http://i.imgur.com/tvdJ249.png)](http://nusii.com)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "medium-editor-insert-plugin",
-  "version": "1.6.1",
+  "version": "2.2.1",
   "description": "jQuery insert plugin for MediumEditor",
   "main": [
     "dist/js/medium-editor-insert-plugin.js",
@@ -14,24 +14,19 @@
     "**/.*",
     "node_modules",
     "bower_components",
-    "test",
-    "test.html",
+    "spec",
     "examples",
     "Gruntfile.js",
     "package.json"
   ],
   "dependencies": {
     "jquery": ">=1.9.0",
-    "medium-editor": "^4.1.1",
-    "handlebars": "~3.0.0",
-    "blueimp-file-upload": "~9.9.0",
+    "medium-editor": "~5.10",
+    "handlebars": "~4.0.0",
+    "blueimp-file-upload": "~9.11.1",
     "jquery-sortable": "~0.9.12"
   },
   "devDependencies": {
-    "qunit": "~1.18.0",
-    "sinon": "~1.14.1",
-    "sinon-qunit": "~2.0.0",
-    "jquery-cycle2": "~2.1.6",
-    "blanket": "~1.1.5"
+    "jquery-cycle2": "~2.1.6"
   }
 }

dist/css/medium-editor-insert-plugin-frontend.css

@@ -1,5 +1,5 @@
 /*! 
- * medium-editor-insert-plugin v1.6.1 - jQuery insert plugin for MediumEditor
+ * medium-editor-insert-plugin v2.2.1 - jQuery insert plugin for MediumEditor
  *
  * https://github.com/orthes/medium-editor-insert-plugin
  * 
@@ -81,4 +81,3 @@
     outline: 0 solid transparent; }
     .medium-insert-images figure figcaption:focus, .mediumInsert figure figcaption:focus, .medium-insert-embeds figure figcaption:focus, .mediumInsert-embeds figure figcaption:focus {
       outline: 0 solid transparent; }
-

dist/css/medium-editor-insert-plugin-frontend.min.css

@@ -1,5 +1,5 @@
 /*! 
- * medium-editor-insert-plugin v1.6.1 - jQuery insert plugin for MediumEditor
+ * medium-editor-insert-plugin v2.2.1 - jQuery insert plugin for MediumEditor
  *
  * https://github.com/orthes/medium-editor-insert-plugin
  * 
@@ -140,7 +140,8 @@
       left: 55px;
       top: -32px; }
       .medium-editor-insert-plugin .medium-insert-buttons .medium-insert-buttons-addons li {
-        display: inline-block; }
+        display: inline-block;
+        background-color: #fff; }
         .medium-editor-insert-plugin .medium-insert-buttons .medium-insert-buttons-addons li a {
           box-sizing: border-box;
           display: inline-block;