Ver Fonte

AMBARI-7264. Dashboard widgets on moving strangeness. (akovalenko)

Aleksandr Kovalenko há 10 anos atrás
pai
commit
701165b66e

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs

@@ -19,7 +19,7 @@
 <div class="cluster-metrics">
 <div class="cluster-metrics">
   <ul>
   <ul>
     <li class="thumbnail row">
     <li class="thumbnail row">
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
           <i class="icon-remove-sign icon-large"></i>
           <i class="icon-remove-sign icon-large"></i>
       </a>
       </a>
       <div class="caption span10">{{view.title}}</div>
       <div class="caption span10">{{view.title}}</div>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs

@@ -19,7 +19,7 @@
 <div class="links">
 <div class="links">
   <ul>
   <ul>
     <li class="thumbnail row">
     <li class="thumbnail row">
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
       <div class="caption span10"> {{view.title}}</div>
       <div class="caption span10"> {{view.title}}</div>
 
 
       <div class="widget-content" >
       <div class="widget-content" >

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs

@@ -19,7 +19,7 @@
 <div class="links">
 <div class="links">
   <ul>
   <ul>
   <li class="thumbnail row">
   <li class="thumbnail row">
-    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     </a>
     <div class="caption span10"> {{view.title}}</div>
     <div class="caption span10"> {{view.title}}</div>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs

@@ -19,7 +19,7 @@
 <div class="links">
 <div class="links">
   <ul>
   <ul>
     <li class="thumbnail row">
     <li class="thumbnail row">
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
         <i class="icon-remove-sign icon-large"></i>
         <i class="icon-remove-sign icon-large"></i>
       </a>
       </a>
       <div class="caption span10"> {{view.title}}</div>
       <div class="caption span10"> {{view.title}}</div>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs

@@ -19,7 +19,7 @@
 <div class="has-hidden-info">
 <div class="has-hidden-info">
   <ul>
   <ul>
     <li class="thumbnail row" >
     <li class="thumbnail row" >
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} {{action deleteWidget target="view"}}><i class="icon-remove-sign icon-large"></i></a>
       <div class="caption span10 slots-caption"> {{view.title}}</div>
       <div class="caption span10 slots-caption"> {{view.title}}</div>
 
 
       <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>
       <div {{bindAttr class=":hidden-info-general view.hiddenInfoClass"}}>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs

@@ -19,7 +19,7 @@
 <div class="has-hidden-info">
 <div class="has-hidden-info">
   <ul>
   <ul>
     <li class="thumbnail row">
     <li class="thumbnail row">
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
         <i class="icon-remove-sign icon-large"></i>
         <i class="icon-remove-sign icon-large"></i>
       </a>
       </a>
       <div class="caption span10">{{view.title}}</div>
       <div class="caption span10">{{view.title}}</div>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs

@@ -19,7 +19,7 @@
 <div class="has-hidden-info">
 <div class="has-hidden-info">
   <ul>
   <ul>
     <li class="thumbnail row" >
     <li class="thumbnail row" >
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
         <i class="icon-remove-sign icon-large"></i>
         <i class="icon-remove-sign icon-large"></i>
       </a>
       </a>
       <div class="caption span10"> {{view.title}}</div>
       <div class="caption span10"> {{view.title}}</div>

+ 1 - 1
ambari-web/app/templates/main/dashboard/widgets/uptime.hbs

@@ -19,7 +19,7 @@
 <div class="has-hidden-info">
 <div class="has-hidden-info">
   <ul>
   <ul>
     <li class="thumbnail row" >
     <li class="thumbnail row" >
-      <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
+      <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action deleteWidget target="view"}}>
         <i class="icon-remove-sign icon-large"></i>
         <i class="icon-remove-sign icon-large"></i>
       </a>
       </a>
       <div class="caption span11"> {{view.title}} </div>
       <div class="caption span11"> {{view.title}} </div>

+ 2 - 2
ambari-web/app/views/main/dashboard/widget.js

@@ -139,7 +139,7 @@ App.DashboardWidgetView = Em.View.extend({
 
 
     });
     });
 
 
-    var browserVerion = this.getInternetExplorerVersion();
+    var browserVersion = this.getInternetExplorerVersion();
     App.ModalPopup.show({
     App.ModalPopup.show({
       header: Em.I18n.t('dashboard.widgets.popupHeader'),
       header: Em.I18n.t('dashboard.widgets.popupHeader'),
       classNames: [ 'sixty-percent-width-modal-edit-widget' ],
       classNames: [ 'sixty-percent-width-modal-edit-widget' ],
@@ -172,7 +172,7 @@ App.DashboardWidgetView = Em.View.extend({
         var handlers = [configObj.get('thresh1'), configObj.get('thresh2')];
         var handlers = [configObj.get('thresh1'), configObj.get('thresh2')];
         var colors = ['#95A800', '#FF8E00', '#B80000']; //color green, orange ,red
         var colors = ['#95A800', '#FF8E00', '#B80000']; //color green, orange ,red
 
 
-        if (browserVerion == -1 || browserVerion > 9) {
+        if (browserVersion == -1 || browserVersion > 9) {
           configObj.set('isIE9', false);
           configObj.set('isIE9', false);
           configObj.set('isGreenOrangeRed', true);
           configObj.set('isGreenOrangeRed', true);
           $("#slider-range").slider({
           $("#slider-range").slider({

+ 14 - 0
ambari-web/app/views/main/dashboard/widgets.js

@@ -44,6 +44,12 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
    */
    */
   isDataLoaded: false,
   isDataLoaded: false,
 
 
+  /**
+   * Define if some widget is currently moving
+   * @type {bool}
+   */
+  isMoving: false,
+
   /**
   /**
    * Make widgets' list sortable on New Dashboard style
    * Make widgets' list sortable on New Dashboard style
    */
    */
@@ -53,6 +59,8 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
       items: "> div",
       items: "> div",
       //placeholder: "sortable-placeholder",
       //placeholder: "sortable-placeholder",
       cursor: "move",
       cursor: "move",
+      tolerance: "pointer",
+      scroll: false,
       update: function (event, ui) {
       update: function (event, ui) {
         if (!App.get('testMode')) {
         if (!App.get('testMode')) {
           // update persist then translate to real
           // update persist then translate to real
@@ -76,6 +84,12 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, {
             //self.translateToReal(newValue);
             //self.translateToReal(newValue);
           });
           });
         }
         }
+      },
+      activate: function(event, ui) {
+        self.set('isMoving', true);
+      },
+      deactivate: function(event, ui) {
+        self.set('isMoving', false);
       }
       }
     }).disableSelection();
     }).disableSelection();
   },
   },