Skip to content

Commit

Permalink
Fixed #457
Browse files Browse the repository at this point in the history
  • Loading branch information
wolf4ood committed Feb 27, 2017
1 parent d1c33b7 commit 821557d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/components/schema/classesList.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ <h4 ng-show="$ctrl.label">
</div>
<div class="col-md-6">
<div class="btn-group pull-right">
<button href="javascript:void(0)" ng-show="$ctrl.label" class="btn btn-sm btn-default" ng-click="$ctrl.onCreate()"><i
<button href="javascript:void(0)" ng-show="$ctrl.label" class="btn btn-sm btn-default"
ng-click="$ctrl.onCreate()"><i
class="fa fa-plus"></i> New {{$ctrl.label}}
</button>
</div>
Expand Down Expand Up @@ -69,12 +70,17 @@ <h4 ng-show="$ctrl.label">
<tbody>
<tr ng-repeat="result in displeyedClasses ">
<td ng-click="$ctrl.openClass(result)">{{result['name']}}</td>
<td>

<td ng-if="!$ctrl.isE">
<spectrum-colorpicker
ng-model="$ctrl.config.config['classes'][result['name']].fill"
options="{preferredFormat: 'hex'}"></spectrum-colorpicker>
</td>
<td ng-if="$ctrl.isE">
<spectrum-colorpicker
ng-model="$ctrl.config.config['classes'][result['name']].stroke"
options="{preferredFormat: 'hex'}"></spectrum-colorpicker>
</td>

<td ng-click="$ctrl.openClass(result)">{{result['superClasses'] | formatArray}}</td>
<td ng-click="$ctrl.openClass(result)">{{result['alias']}}</td>
<td ng-click="$ctrl.openClass(result)">
Expand Down
3 changes: 3 additions & 0 deletions src/components/schema/classesList.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ let SchemaClassesController = function ($scope, $element, $attrs, $location, $mo
};


ctrl.isE = ctrl.label == 'Edge';

ctrl.strict = Database.isStrictSql();
ctrl.queryFilter = null;
ctrl.$onChanges = (changes) => {
Expand Down Expand Up @@ -132,6 +134,7 @@ let INIT = (module) => {
bindings: {
label: "@",
classes: '<',
isE: '<',
config: '=',
query: '<',
onCreate: '&'
Expand Down

0 comments on commit 821557d

Please sign in to comment.