Quellcode durchsuchen

fixed editting on uncollapsable rows; closes #246

Rashid Khan vor 12 Jahren
Ursprung
Commit
e5ff7411d4
2 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
  1. 3 0
      js/controllers.js
  2. 2 3
      partials/dashboard.html

+ 3 - 0
js/controllers.js

@@ -103,6 +103,9 @@ angular.module('kibana.controllers', [])
   };
   };
 
 
   $scope.toggle_row = function(row) {
   $scope.toggle_row = function(row) {
+    if(!row.collapsable) {
+      return;
+    }
     row.collapse = row.collapse ? false : true;
     row.collapse = row.collapse ? false : true;
     if (!row.collapse) {
     if (!row.collapse) {
       $timeout(function() {
       $timeout(function() {

+ 2 - 3
partials/dashboard.html

@@ -5,13 +5,12 @@
     <div class="row-control">
     <div class="row-control">
       <div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
       <div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
         <div style="vertical-align:bottom">
         <div style="vertical-align:bottom">
-          <div ng-show="row.collapsable">
+          <div>
             <div ng-class="{'row-open': !row.collapse, 'row-close': row.collapse}" style="position:absolute;margin-left:-60px;">
             <div ng-class="{'row-open': !row.collapse, 'row-close': row.collapse}" style="position:absolute;margin-left:-60px;">
-              <span class='pointer' ng-click="toggle_row(row)">{{row.title}}</span>
+              <span ng-class='{pointer:row.collapsable}' ng-click="toggle_row(row)">{{row.title}}</span>
               <i ng-show="row.editable" class="icon-cog pointer editlink" bs-modal="'partials/roweditor.html'"></i>
               <i ng-show="row.editable" class="icon-cog pointer editlink" bs-modal="'partials/roweditor.html'"></i>
             </div>
             </div>
           </div>
           </div>
-          <small ng-hide="row.collapsable" class="rotated">{{row.title}}</small>
         </div>
         </div>
       </div>
       </div>
       <div class="row-fluid" style="padding-top:0px" ng-hide="row.collapse">
       <div class="row-fluid" style="padding-top:0px" ng-hide="row.collapse">