Update authors, version

mervick · Aug 3, 2016 · 232efd2 · 232efd2
1 parent 7304890
commit 232efd2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,9 @@
   "name": "emojionearea",
   "homepage": "https://github.com/mervick/emojionearea",
   "authors": [
-    "Andrey Izman <izmanw@gmail.com>"
+    "Andrey Izman <izmanw@gmail.com>",
+    "Klas Lundberg <klas.lundberg@instinct.se>",
+    "Merlin Mason <info@merlinmason.co.uk>"
   ],
   "main": "dist/emojionearea.js",
   "dependencies": {

diff --git a/composer.json b/composer.json
@@ -7,6 +7,14 @@
         {
             "name": "Andrey Izman",
             "email": "izmanw@gmail.com"
+        },
+        {
+            "name": "Klas Lundberg",
+            "email": "klas.lundberg@instinct.se"
+        },
+        {
+            "name": "Merlin Mason",
+            "email": "info@merlinmason.co.uk"
         }
     ],
     "minimum-stability": "dev",

diff --git a/dist/emojionearea.js b/dist/emojionearea.js
@@ -1,9 +1,9 @@
 /*!
- * EmojioneArea v3.0.4
+ * EmojioneArea v3.0.7
  * https://github.com/mervick/emojionearea
  * Copyright Andrey Izman and other contributors
  * Released under the MIT license
- * Date: 2016-08-02T07:54Z
+ * Date: 2016-08-03T00:11Z
  */
 (function(document, window, $) {
     'use strict';
@@ -527,7 +527,7 @@
 
 		var category = self.picker.find(".emojionearea-category[name=recent]");
 		var filter = self.picker.find(".emojionearea-filter-recent");
-
+		
 		if (category.length) {
 			var emojis = getRecent();
 			if (emojis !== "") {
@@ -549,7 +549,7 @@
 			} else {
 				if (filter.hasClass("active")) {
 					filter.removeClass("active").next().addClass("active");
-				}
+				} 
 				category.hide();
 				filter.hide();
 			}
@@ -770,7 +770,7 @@
 				var filter = self.picker.find(".emojionearea-filter-recent");
 				if (filter.hasClass("active")) {
 					filter.removeClass("active").next().addClass("active");
-				}
+				} 
 				category.hide();
 				filter.hide();
 			}
@@ -920,7 +920,7 @@
 					maxCount: options.textcomplete.maxCount,
 					placement: options.textcomplete.placement
 				};
-
+				
                 if (options.shortcuts) {
                     textcompleteOptions.onKeydown = function (e, commands) {
                         if (!e.ctrlKey && e.which == 13) {
@@ -950,11 +950,11 @@
                         },
                         cache: true,
                         index: 1
-                    }
+                    }				
                 ], textcompleteOptions);
-
+				
 				if (options.textcomplete.placement) {
-					// Enable correct positioning for textcomplete
+					// Enable correct positioning for textcomplete 
 					if (editor.data('textComplete').option.appendTo.css("position") == "static") {
 						editor.data('textComplete').option.appendTo.css("position", "relative");
 					}
@@ -985,7 +985,7 @@
         //}, self.id === 1); // calcElapsedTime()
     };
     var emojioneVersion = window.emojioneVersion || '2.1.4';
-    var cdn = {
+    var cdn = { 
 		defaultBase: "https://cdnjs.cloudflare.com/ajax/libs/emojione/",
 		base: null,
 		isLoading: false
@@ -1183,4 +1183,4 @@
 
 	$.fn.emojioneArea.defaults = getDefaultOptions();
 
-}) (document, window, jQuery);
+}) (document, window, jQuery);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emojionearea",
-  "version": "3.0.4",
+  "version": "3.0.7",
   "description": "WYSIWYG-like EmojiOne Converter / Picker Plugin for jQuery",
   "main": "dist/emojionearea.js",
   "scripts": {
@@ -18,6 +18,10 @@
     "emojionearea"
   ],
   "author": "Andrey Izman <izmanw@gmail.com>",
+  "contributors": [
+    "Klas Lundberg <klas.lundberg@instinct.se>",
+    "Merlin Mason <info@merlinmason.co.uk>"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/mervick/emojionearea/issues"