Merge branch 'master' of https://github.com/orthes/medium-editor-insert-plugin

Conflicts:
	README.md

Author: nleush

.travis.yml

@@ -1,11 +1,17 @@
+# faster builds on new travis setup not using sudo
+sudo: false
+
 language: node_js
+
 node_js:
   - "0.10"
+
 before_script:
   - npm install -g grunt-cli
   - npm install -g bower
   - bower install
+
 cache:
   directories:
     - node_modules
-    - bower_components
+    - bower_components

CHANGES.md

@@ -0,0 +1,45 @@
+
+1.6.1 / 2015-04-30
+==================
+
+  * Fix initializing plugin without addons
+  * Trigger the input event after swapping out the preview image for the real one
+  * Change default formData to null
+
+1.6.0/ 2015-04-16
+==================
+
+  * Add option ```captions``` (boolean) to images and embeds to enable/disable captions. Captions are enabled by default.
+  * Expose option ```fileUploadOptions``` in images to enable file upload configuration
+  * Use medium-editor like placeholders for embeds and captions (using ```:after``` CSS pseudo-element instead of actual DOM element)
+  * Add support for right click on placeholders (both in embeds and captions) to enable pasting via context menu
+  * Deprecate ```uploadScript``` and ```formData``` options in images. Use ```fileUploadOptions``` instead.
+
+1.5.2 / 2015-04-15
+==================
+
+  * Remove contenteditable attr and overlay div from embeds on ```serialize```
+  * Remove contenteditable attr from figure and figcaption in images on ```serialize```
+  * Simplify button positioning
+
+1.5.1 / 2015-04-13
+==================
+
+  * Don't add empty paragraph on image deletion, when empty paragraph already exists
+  * Fix clicking on placeholder in FF
+  * Hide editor's placeholder on image upload
+  * Use https for instagram and vimeo
+  * Ensure core is ```enabled``` when ```selectEmbed``` or ```selectImage``` are called
+
+1.5.0 / 2015-04-02
+==================
+
+  * Update medium-editor to v4.1.1
+  * Add support for editor's new ```destroy``` and ```setup``` methods and removed ```activatePlaceholder``` method
+  * Add ```formData``` option to images (see [jQuery-File-Upload docs](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#formdata))
+  * Add ```uploadCompleted``` callback to images
+  * Trigger ```input``` event also when preview image is inserted to the DOM
+  * Disable embed toolbars when ```styles```, or ```actions``` options are empty
+  * Make sure that after removing caption placeholder, caret is placed inside the caption
+  * Hide buttons when toolbar actions are triggered
+  * Don't auto remove grid style when removing images

Gruntfile.js

@@ -1,4 +1,10 @@
 module.exports = function(grunt) {
+    // show elapsed time at the end
+    require('time-grunt')(grunt);
+    // load grunt tasks just in time
+    require('jit-grunt')(grunt, {
+        usebanner: 'grunt-banner'
+    });
 
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
@@ -13,7 +19,7 @@ module.exports = function(grunt) {
                 dest: 'dist/js/<%= pkg.name %>.min.js'
             }
         },
-        
+
         concat: {
             dist: {
                 options: {
@@ -31,8 +37,12 @@ module.exports = function(grunt) {
             files: ['src/js/*.js', '!src/js/templates.js', 'test/*.js']
         },
 
-        qunit: {
-            unit: 'test.html'
+        blanket_qunit: {
+          options: {
+              urls: ['test.html?coverage=true&gruntReport'],
+              threshold: 70
+          },
+          unit: {}
         },
 
         sass: {
@@ -111,18 +121,7 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-qunit');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-autoprefixer');
-    grunt.loadNpmTasks('grunt-sass');
-    grunt.loadNpmTasks('grunt-csso');
-    grunt.loadNpmTasks('grunt-banner');
-    grunt.loadNpmTasks('grunt-contrib-handlebars');
-
-    grunt.registerTask('test', ['jshint', 'qunit']);
+    grunt.registerTask('test', ['jshint', 'blanket_qunit']);
     grunt.registerTask('js', ['test', 'handlebars', 'uglify', 'concat']);
     grunt.registerTask('css', ['sass', 'autoprefixer', 'csso', 'usebanner']);
     grunt.registerTask('default', ['js', 'css']);

README.md

@@ -1,160 +1,87 @@
-jQuery insert plugin for MediumEditor
-======================================
+# jQuery insert plugin for MediumEditor
 
-This plugin expands capabilities of [MediumEditor](https://github.com/daviferreira/medium-editor) (a clone of [medium.com](http://medium.com) WYSIWYG editor).
+[![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)
 
-The plugins enables users to insert into the editor various types of content (depending on available addons).
+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).
 
 Current available addons:
 
-- images
-- embeds (either through oEmbed proxy, such as [Iframely](https://iframely.com), or pre-defined parsers such as - Youtube, Vimeo, Twitter, Facebook, Instagram)
-- tables (basic table creating)
-
----
-
-This is a legacy version of the plugin. To see the current **1.0 version** go to [master branch](https://github.com/orthes/medium-editor-insert-plugin).
+- **images**
+- **embeds** (either through oEmbed proxy, such as [Iframely](https://iframely.com/), or pre-defined parsers such as - Youtube, Vimeo, Twitter, Facebook, Instagram)
 
----
 
-## Table of Contents
+## Demo
 
-- [Download](#download)
-- [Usage](#usage)
-- [Options](#options)
-- [Methods](#methods)
-- [Development & Contributing](#development)
-- [Author](#author)
+[http://orthes.github.io/medium-editor-insert-plugin](http://orthes.github.io/medium-editor-insert-plugin)
 
 
-## <a name="download"></a>Download
+## Download
 
-- Bower: ```bower install medium-editor-insert-plugin#^0.3 --save```
-- Manual: [Download as ZIP](https://github.com/orthes/medium-editor-insert-plugin/archive/0.3.2.zip)
+* Bower (recommended): ```bower install medium-editor-insert-plugin#^1.0 --save```
+* Manual: [Download the latest release](https://github.com/orthes/medium-editor-insert-plugin/releases)
 
 
-## <a name="usage"></a>Usage
+## Quick Start
 
-The first step is to add all prerequisites (MediumEditor and jQuery):
+The first step is to include the plugin with all its dependencies to your code:
 
 ```html
+<!-- CSS -->
 <link rel="stylesheet" href="bower_components/medium-editor/dist/css/medium-editor.min.css">
-<link rel="stylesheet" href="bower_components/medium-editor/dist/css/themes/default.css">
-<script src="bower_components/medium-editor/dist/js/medium-editor.min.js"></script>
-<script src="bower_components/jquery/jquery.min.js"></script>
-```
-
-Now you have two possibilites. You can load all addons at once:
-
-```html
+<link rel="stylesheet" href="bower_components/medium-editor/dist/css/themes/default.css" id="medium-editor-theme">
+<!-- Font Awesome for awesome icons. You can redefine icons used in a plugin configuration -->
+<link href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+<!-- The plugin itself -->
 <link rel="stylesheet" href="bower_components/medium-editor-insert-plugin/dist/css/medium-editor-insert-plugin.min.css">
-<script src="bower_components/medium-editor-insert-plugin/dist/js/medium-editor-insert-plugin.all.min.js"></script>
-```
 
-Or if you for some reason want, you can load only addons that you want separately. In this case, don't forget to load medium-editor-insert-plugin.min.js, which is the main plugin file, that initializes addons:
-
-```html
-<link rel="stylesheet" href="bower_components/medium-editor-insert-plugin/dist/css/medium-editor-insert-plugin.min.css">
-<script src="bower_components/medium-editor-insert-plugin/dist/js/addons/medium-editor-insert-plugin.min.js"></script>
-<script src="bower_components/medium-editor-insert-plugin/dist/js/addons/medium-editor-insert-images.min.js"></script>
-<script src="bower_components/medium-editor-insert-plugin/dist/js/addons/medium-editor-insert-embeds.min.js"></script>
-<script src="bower_components/medium-editor-insert-plugin/dist/js/addons/medium-editor-insert-tables.min.js"></script>
+<!-- JS -->
+<script src="bower_components/jquery/dist/jquery.min.js"></script>
+<script src="bower_components/medium-editor/dist/js/medium-editor.js"></script>
+<script src="bower_components/handlebars/handlebars.runtime.min.js"></script>
+<script src="bower_components/jquery-sortable/source/js/jquery-sortable-min.js"></script>
+<!-- Unfortunately, jQuery File Upload Plugin has a few more dependencies itself -->
+<script src="bower_components/blueimp-file-upload/js/vendor/jquery.ui.widget.js"></script>
+<script src="bower_components/blueimp-file-upload/js/jquery.iframe-transport.js"></script>
+<script src="bower_components/blueimp-file-upload/js/jquery.fileupload.js"></script>
+<!-- The plugin itself -->
+<script src="bower_components/medium-editor-insert-plugin/dist/js/medium-editor-insert-plugin.min.js"></script>
 ```
 
 Initialize MediumEditor as you normally would:
 
-```html
-<script>var editor = new MediumEditor('.editable');</script>
+```javascript
+var editor = new MediumEditor('.editable');
 ```
 
-Finally, you can initialize the insert plugin with images and embed addon:
+Finally, you can initialize the insert plugin:
 
 ```javascript
 $(function () {
-  $('.editable').mediumInsert({
-    editor: editor,
-    addons: {
-      images: {},
-      embeds: {
-        oembedProxy: 'http://medium.iframe.ly/api/oembed?iframe=1'
-      },
-      tables: {}
-    }
-  });
+    $('.editable').mediumInsert({
+        editor: editor
+    });
 });
 ```
 
-After you have a working editor with the plugin, you will want to get a clean content of the editor without any additional unnecessary placeholders. This could be done by using the editor's ```serialize()``` function, which returns JSON object with elements contents.
-
-```javascript
-var allContents = editor.serialize();
-var elContent = allContents["element-0"].value;
-```
-
-For styling the content in frontend (where it will be read only without editing posibilities) use this CSS:
-
-```html
-<link rel="stylesheet" href="bower_components/medium-editor-insert-plugin/dist/css/medium-editor-insert-plugin-frontend.min.css">
-```
-
-## <a name="options"></a>Options
-
-- **editor**: (MediumEditor) instance of MediumEditor
-- **beginning**: (boolean) whether inserting at the very beginning of the editor should be possible (in other words, if the first placeholder for instering should be placed as the first element of the editor, or after the first parahraph). Default: *false*
-- **addons**: (object) keys are names of used addons and values are objects of addons options. (NOTICE: Remember to use medium-editor-insert-plugin.all.min.js, which includes all addons, or separately load medium-editor-insert-plugin.min.js and medium-editor-insert-{ADDON-NAME}.min.js).
-    - **images**:
-        - **imagesUploadScript**: (string) relative path to a script that handles file uploads. Default: *upload.php*
-        - **imagesDeleteScript**: (string) relative path to a script that handles file deleting. Default: *delete.php*
-        - **useDragAndDrop**: (boolean) active or inactive image's drag and drop. Default: *true*
-        - **formatData**: (function (file)) function that formats data before sending them to server while uploading an image
-        - **uploadFile**: (function ($placeholder, file, that)) function uploading an image to a server
-        - **deleteFile**: (function (file, that)) function deleting an image from a server
-    - **embeds**:
-        - **urlPlaceholder**: (string) placeholder displayed when entering URL to embed. Default: *Paste or type a link*
-        - **oembedProxy**: (string) URL to oEmbed proxy endpoint, such as Iframely, Embedly or your own. You are welcome to use "http://medium.iframe.ly/api/oembed?iframe=1" for your dev and testing needs, courtesy of [Iframely](https://iframely.com). Default: none, which will make the plugin use pre-defined set of embed rules without making server calls.
-    - **tables**:
-        - **defaultRows**: (integer) default number of rows. Default: *2*
-        - **defaultCols**: (integer) default number of columns. Default: *2*
-- **enabled**: (boolean) plugin's state: Default *true*.
-
-
-## <a name="methods"></a>Methods
-
-- **enable**: enables the plugin. It's connected to Medium Editor's own activate function, so if the editor is activated, so is the plugin. (The plugin is enabled automatically. Use it only if you previously disabled the plugin.)
-- **disable**: disables the plugin. It's connected to Medium Editor's own deactivate function, so if the editor is deactivated, so is the plugin.
-- **registerAddon**: create new addon, like images or maps or embeds. Your addon object should contain `init(options)` method to initialize your addon and `insertButton` method that contains code of button in list of available addons.
-- **getAddon**: simple getter for available addons.
-
-Use example:
-
-```javascript
-$('.editable').mediumInsert('disable');
-```
-
-## <a name="development"></a>Development & Contributing
-
-[![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)
-
-I'm happy when you not only use the plugin, but contribute your improvements, too. First of all, go to [waffle.io](http://waffle.io/orthes/medium-editor-insert-plugin) (that's the blue icon above),
-where you'll find list of all work, that need to be done. Feel free to grab one issue, assign it to yourself and start working.
-
-The plugin uses [Grunt](http://gruntjs.com/) for automating development tasks and [Bower](http://bower.io/) for package management. To install all the necessities for development run these commands:
-
-```
-npm install
-bower install
-```
-
-These are available Grunt tasks:
-
-- **js**: runs jshint, uglify and copy
-- **css**: runs compass
-- **test**: runs jshint and qunit
-- **watch**: watches for modifications on script/scss files and runs js/css task
+## [Documentation](https://github.com/orthes/medium-editor-insert-plugin/wiki)
 
-Please, test you're code to your best knowledge, especially if you're adding new features.
+- [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)
+- [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)
+- [Author & Contributors](https://github.com/orthes/medium-editor-insert-plugin/wiki/Author-&-Contributors)
 
 
-## <a name="author"></a>Author
+## Sponsors
 
-Pavel Linkesch | [@linkesch](http://twitter.com/linkesch) | http://www.linkesch.sk
+[creator5](http://www.creator5.com) | [Maker](http://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)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "medium-editor-insert-plugin",
-  "version": "1.0.2",
+  "version": "1.6.1",
   "description": "jQuery insert plugin for MediumEditor",
   "main": [
     "dist/js/medium-editor-insert-plugin.js",
@@ -22,15 +22,16 @@
   ],
   "dependencies": {
     "jquery": ">=1.9.0",
-    "medium-editor": "~2.3.0",
-    "handlebars": "~2.0.0",
+    "medium-editor": "^4.1.1",
+    "handlebars": "~3.0.0",
     "blueimp-file-upload": "~9.9.0",
     "jquery-sortable": "~0.9.12"
   },
   "devDependencies": {
-    "qunit": "~1.17.1",
-    "sinon": "~1.12.1",
+    "qunit": "~1.18.0",
+    "sinon": "~1.14.1",
     "sinon-qunit": "~2.0.0",
-    "jquery-cycle2": "~2.1.6"
+    "jquery-cycle2": "~2.1.6",
+    "blanket": "~1.1.5"
   }
 }