Disabled send form when press Enter on editable textfield in widget (#…

…133) Disabled copy paste when field is editable Add commit value by change event
wirenboard · Jul 3, 2019 · 36c458d · 36c458d
1 parent 7a0f8b5
commit 36c458d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/app/scripts/directives/displaycell.html b/app/scripts/directives/displaycell.html
@@ -12,7 +12,7 @@
                  'focus': 'mouseleave'
                }"
                tooltip-class="custom-tooltip cell-name-tooltip"></cell-name>
-    <button title="History" class="display-cell-btn btn bg-color-blueDark txt-color-white show-on-parent-hover"
+    <button title="History" type="button" class="display-cell-btn btn bg-color-blueDark txt-color-white show-on-parent-hover"
             ng-click="displayCellCtrl.redirect(cell.id)">
       <i class="glyphicon glyphicon-stats"></i>
     </button>

diff --git a/app/scripts/directives/displaycell.js b/app/scripts/directives/displaycell.js
@@ -22,7 +22,9 @@ function displayCellDirective(displayCellConfig, $compile) {
     }*/
 
     copy(value) {
-      this.handleData.copyToClipboard(value)
+      if (this.cell.readOnly) {
+        this.handleData.copyToClipboard(value)
+      }
     }
 
     shouldDisplayCellName () {

diff --git a/app/scripts/directives/explicitchanges.js b/app/scripts/directives/explicitchanges.js
@@ -16,7 +16,7 @@ function explicitChangesDirective() {
       }
 
       element.off('input').off('keydown').off('change');
-      element.on('blur', sendValue);
+      element.on('blur, change', sendValue);
       element.on('keydown', e => {
         if (e.keyCode == 13)
           sendValue();

diff --git a/app/scripts/directives/textcell.html b/app/scripts/directives/textcell.html
@@ -6,6 +6,7 @@
     'outsideClick': 'mouseleave',
     'focus': 'mouseleave'
   }"
+  tooltip-enable="{{ cell.readOnly }}"
 >
   <p
     ng-if="cell.readOnly"

diff --git a/app/scripts/directives/valuecell.html b/app/scripts/directives/valuecell.html
@@ -8,6 +8,7 @@
     'focus': 'mouseleave'
   }"
   tooltip-class="custom-tooltip"
+  tooltip-enable="{{ cell.readOnly }}"
 >
   <input ng-if="cell.valueType == 'number' && !cell.readOnly" type="number"
          min="{{ cell.min }}" max="{{ cell.max }}" step="{{ cell.step }}"