MAGETWO-48836: Merge branch 'MAGETWO-48836' of github.corp.magento.com:magento-vanilla/magento2ce into MAGETWO-48913

Author: slopok

app/code/Magento/Ui/view/base/web/js/form/adapter.js

@@ -9,10 +9,10 @@ define([
     'use strict';
 
     var buttons = {
-        'reset':            '#reset',
-        'save':             '#save',
-        'saveAndContinue':  '#save_and_continue'
-    },
+            'reset':            '#reset',
+            'save':             '#save',
+            'saveAndContinue':  '#save_and_continue'
+        },
         selectorPrefix = '',
         eventPrefix;
 

app/code/Magento/Ui/view/base/web/js/form/components/button.js

@@ -16,9 +16,10 @@ define([
             additionalClasses: {},
             displayArea: 'outsideGroup',
             displayAsLink: false,
-            visible: true,
             elementTmpl: 'ui/form/element/button',
-            template: 'ui/form/components/button/simple'
+            template: 'ui/form/components/button/simple',
+            visible: true,
+            disabled: false
         },
 
         /**
@@ -31,6 +32,15 @@ define([
                 ._setClasses();
         },
 
+        /** @inheritdoc */
+        initObservable: function () {
+            return this._super()
+                .observe([
+                    'visible',
+                    'disabled'
+                ]);
+        },
+
         /**
          * Performs configured actions
          */

app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html

@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<render args="elementTmpl"/>
+<render args="elementTmpl" if="visible"/>

app/code/Magento/Ui/view/base/web/templates/form/element/button.html

@@ -10,6 +10,9 @@
             'action-secondary': !$data.displayAsLink
         "
         click="action"
-        text="title"
+        disable="disabled"
         attr="'data-index': index">
-</button>
+        >
+    <span text="title">
+    </span>
+</button>