@worktile/theia 3.0.2 → 3.0.3

package/bundles/worktile-theia.umd.js

@@ -1451,17 +1451,17 @@
 
     var mergeOptions = function (plugin, override) {
         var options = plugin.options;
-        var newOptions = {};
-        for (var option in options) {
-            if (Array.isArray(options[option]) && override.options[option]) {
-                newOptions[option] = mergeArray(options[option], override.options[option]);
+        var newOptions = options;
+        for (var option in override.options) {
+            if (Array.isArray(override.options[option]) && newOptions[option]) {
+                newOptions[option] = mergeArray(newOptions[option], override.options[option]);
                 continue;
             }
-            if (util.isObject(options[option])) {
-                newOptions[option] = _.assign(options[option], override.options[option]);
+            if (util.isObject(override.options[option]) && newOptions[option]) {
+                newOptions[option] = _.assign(newOptions[option], override.options[option]);
                 continue;
             }
-            newOptions[option] = override.options[option] ? override.options[option] : options[option];
+            newOptions[option] = override.options[option];
         }
         plugin.options = newOptions;
     };
@@ -6556,6 +6556,7 @@
 
     var defaultAutoFormatRules = [
         {
+            key: exports.ElementKinds.heading_1,
             type: exports.ElementKinds.heading_1,
             markup: '#',
             format: function (editor) {
@@ -6563,6 +6564,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_2,
             type: exports.ElementKinds.heading_2,
             markup: '##',
             format: function (editor) {
@@ -6570,6 +6572,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_3,
             type: exports.ElementKinds.heading_3,
             markup: '###',
             format: function (editor) {
@@ -6577,6 +6580,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_4,
             type: exports.ElementKinds.heading_4,
             markup: '####',
             format: function (editor) {
@@ -6584,6 +6588,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_5,
             type: exports.ElementKinds.heading_5,
             markup: '#####',
             format: function (editor) {
@@ -6591,6 +6596,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_6,
             type: exports.ElementKinds.heading_6,
             markup: '######',
             format: function (editor) {
@@ -6598,6 +6604,7 @@
             }
         },
         {
+            key: exports.ElementKinds.blockquote,
             type: exports.ElementKinds.blockquote,
             markup: ['>'],
             format: function (editor) {
@@ -6605,30 +6612,35 @@
             }
         },
         {
+            key: exports.MarkTypes.bold,
             type: exports.MarkTypes.bold,
             between: ['**', '**'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.bold + "__",
             type: exports.MarkTypes.bold,
             between: ['__', '__'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.italic,
             type: exports.MarkTypes.italic,
             between: ['*', '*'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.italic + "_",
             type: exports.MarkTypes.italic,
             between: ['_', '_'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.ElementKinds.inlineCode,
             type: exports.ElementKinds.inlineCode,
             between: ['`', '`'],
             mode: 'inline',
@@ -6638,12 +6650,14 @@
             }
         },
         {
+            key: exports.MarkTypes.strike,
             type: exports.MarkTypes.strike,
             between: ['~~', '~~'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.ElementKinds.code,
             type: exports.ElementKinds.code,
             markup: '```',
             format: function (editor) {
@@ -6651,6 +6665,7 @@
             }
         },
         {
+            key: exports.ElementKinds.listItem,
             type: exports.ElementKinds.listItem,
             markup: [],
             match: function (editor) {
@@ -6661,8 +6676,8 @@
             }
         },
         {
-            type: exports.ElementKinds.listItem,
             key: exports.ElementKinds.numberedList,
+            type: exports.ElementKinds.listItem,
             markup: [],
             match: function (editor, textFromBlockStart) {
                 return isParagraph(editor) && /^-?\d+(\.|\))$/.test(textFromBlockStart) ? [textFromBlockStart] : [];
@@ -6679,6 +6694,7 @@
             }
         },
         {
+            key: exports.ElementKinds.checkItem,
             type: exports.ElementKinds.checkItem,
             markup: [],
             match: function (editor) {
@@ -6689,6 +6705,7 @@
             }
         },
         {
+            key: exports.ElementKinds.hr,
             type: exports.ElementKinds.hr,
             markup: '---',
             insertTrigger: true