mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #253 from rashidkpc/master
fixed editting on uncollapsable rows; closes #246
This commit is contained in:
commit
9fedd270c8
@ -103,6 +103,9 @@ angular.module('kibana.controllers', [])
|
||||
};
|
||||
|
||||
$scope.toggle_row = function(row) {
|
||||
if(!row.collapsable) {
|
||||
return;
|
||||
}
|
||||
row.collapse = row.collapse ? false : true;
|
||||
if (!row.collapse) {
|
||||
$timeout(function() {
|
||||
|
@ -5,13 +5,12 @@
|
||||
<div class="row-control">
|
||||
<div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
|
||||
<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;">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
<small ng-hide="row.collapsable" class="rotated">{{row.title}}</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-fluid" style="padding-top:0px" ng-hide="row.collapse">
|
||||
|
Loading…
Reference in New Issue
Block a user