ru.coon 2.7.47 → 2.7.48

package/src/uielement/plugin/configPanel/AddBindingsPluginConfigPanelFormEditor.scss

@@ -1,29 +1,29 @@
-.ace-editor-content .x-grid-cell-inner {
-  overflow: auto;
-  white-space: pre-wrap;
-}
-
-.middle-align-elem{
-  vertical-align: middle;
-}
-
-.is-used-action{
-  background-color: #ddfdd2;
-  color: #111 !important;
-}
-
-.not-in-list-action{
-  cursor: pointer;
-  color: rgba(243, 173, 22, 0.89);
-  float:right;
-  width:18px;
-  height: 20px;
-}
-
-.already-exists-in-list-action{
-  cursor: pointer;
-  color: rgba(231, 70, 70, 0.91);
-  float:right;
-  width:18px;
-  height: 20px;
-}
+.ace-editor-content .x-grid-cell-inner {
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+.middle-align-elem{
+  vertical-align: middle;
+}
+
+.is-used-action{
+  background-color: #ddfdd2;
+  color: #111 !important;
+}
+
+.not-in-list-action{
+  cursor: pointer;
+  color: rgba(243, 173, 22, 0.89);
+  float:right;
+  width:18px;
+  height: 20px;
+}
+
+.already-exists-in-list-action{
+  cursor: pointer;
+  color: rgba(231, 70, 70, 0.91);
+  float:right;
+  width:18px;
+  height: 20px;
+}

package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.scss

@@ -1,22 +1,22 @@
-.ExecuteCommandPluginConfigPanelFormEditor {
-  $required-flag-color: dynamic(#bf1313);
-  font-size: 12px;
-  margin: 5px;
-  .required-flag {
-    font-size: 18px;
-    color: $required-flag-color;
-  }
-  span.code {
-    color: green;
-    font-family: "Lucida Console", "Courier New", monospace;
-  }
-  .x-form-trigger-default.helpicon {
-    background-color: white;
-  }
-
-  .wrong-parameters {
-    color: green;
-    font-style: italic;
-    font-family: "Lucida Console", "Courier New", monospace;
-  }
-}
+.ExecuteCommandPluginConfigPanelFormEditor {
+  $required-flag-color: dynamic(#bf1313);
+  font-size: 12px;
+  margin: 5px;
+  .required-flag {
+    font-size: 18px;
+    color: $required-flag-color;
+  }
+  span.code {
+    color: green;
+    font-family: "Lucida Console", "Courier New", monospace;
+  }
+  .x-form-trigger-default.helpicon {
+    background-color: white;
+  }
+
+  .wrong-parameters {
+    color: green;
+    font-style: italic;
+    font-family: "Lucida Console", "Courier New", monospace;
+  }
+}

package/src/util.js

@@ -534,7 +534,21 @@ Ext.define('Coon.util', {
 
     isTypeIn(data, types) {
         return Array.isArray(types) &&
-            types.included(Coon.util.typeOf(data));
+            types.includes(Coon.util.typeOf(data));
+    },
+
+    runIfTypeIn(data, types, trueFn, falseFn) {
+        if (Coon.util.isTypeIn(data, types)) {
+            if (typeof trueFn === 'function') {
+                return trueFn(data);
+            } else {
+                return data;
+            }
+        } else {
+            if (typeof falseFn === 'function') {
+                return falseFn(data);
+            }
+        }
     },
 
     typeEqual(src, dst) {
@@ -629,14 +643,21 @@ Ext.define('Coon.util', {
      * @param {*} scope context
      * @returns
      */
-    bindMethods(methods, from, to, scope) {
+    bindMethods(methods, from, to, scope, force) {
+        if (typeof methods === 'string') {
+            methods = [methods];
+        }
         if (!Array.isArray(methods) || !Ext.isObject(from) || !Ext.isObject(to)) {
             return;
         }
         methods.forEach((name) => {
             const method = from[name];
             if (typeof method === 'function') {
-                to[name] = method.bind(scope || from);
+                if (force) {
+                    to[name] = method.bind(scope || from);
+                } else if (!to[name]) {
+                    to[name] = method.bind(scope || from);
+                }
             }
         });
     },