Commit 3775ce08 authored by Valentin Hervieu's avatar Valentin Hervieu

Apply editorconfig style to all code base.

parent 29a0d87f
...@@ -50,7 +50,11 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -50,7 +50,11 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
} }
} }
}; };
$scope.otherData = {start: 0, change: 0, end: 0}; $scope.otherData = {
start: 0,
change: 0,
end: 0
};
//Slider config with custom display function //Slider config with custom display function
$scope.slider_translate = { $scope.slider_translate = {
...@@ -69,7 +73,7 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -69,7 +73,7 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
$scope.slider_alphabet = { $scope.slider_alphabet = {
value: 0, value: 0,
options: { options: {
stepsArray:'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('') stepsArray: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
} }
}; };
...@@ -263,7 +267,7 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -263,7 +267,7 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
$scope.percentages = percentages; $scope.percentages = percentages;
}); });
modalInstance.rendered.then(function() { modalInstance.rendered.then(function() {
$rootScope.$broadcast('rzSliderForceRender');//Force refresh sliders on render. Otherwise bullets are aligned at left side. $rootScope.$broadcast('rzSliderForceRender'); //Force refresh sliders on render. Otherwise bullets are aligned at left side.
}); });
}; };
...@@ -302,10 +306,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -302,10 +306,9 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
} }
}; };
$scope.toggleHighValue = function() { $scope.toggleHighValue = function() {
if($scope.slider_all_options.maxValue != null) { if ($scope.slider_all_options.maxValue != null) {
$scope.slider_all_options.maxValue = undefined; $scope.slider_all_options.maxValue = undefined;
} } else {
else {
$scope.slider_all_options.maxValue = 8; $scope.slider_all_options.maxValue = 8;
} }
} }
......
...@@ -384,8 +384,7 @@ ...@@ -384,8 +384,7 @@
this.customTrFn = function(value) { this.customTrFn = function(value) {
return this.options.stepsArray[value]; return this.options.stepsArray[value];
}; };
} } else if (this.options.translate)
else if (this.options.translate)
this.customTrFn = this.options.translate; this.customTrFn = this.options.translate;
else else
this.customTrFn = function(value) { this.customTrFn = function(value) {
...@@ -670,7 +669,7 @@ ...@@ -670,7 +669,7 @@
var tooltip = ''; var tooltip = '';
if (this.options.ticksValuesTooltip) { if (this.options.ticksValuesTooltip) {
tooltip = 'uib-tooltip="' + this.options.ticksValuesTooltip(value) + '"'; tooltip = 'uib-tooltip="' + this.options.ticksValuesTooltip(value) + '"';
if(this.options.vertical) if (this.options.vertical)
tooltip += ' tooltip-placement="right"' tooltip += ' tooltip-placement="right"'
} }
positions += '<span ' + tooltip + ' class="tick-value">' + this.getDisplayValue(value) + '</span>'; positions += '<span ' + tooltip + ' class="tick-value">' + this.getDisplayValue(value) + '</span>';
......
This diff is collapsed.
...@@ -384,8 +384,7 @@ ...@@ -384,8 +384,7 @@
this.customTrFn = function(value) { this.customTrFn = function(value) {
return this.options.stepsArray[value]; return this.options.stepsArray[value];
}; };
} } else if (this.options.translate)
else if (this.options.translate)
this.customTrFn = this.options.translate; this.customTrFn = this.options.translate;
else else
this.customTrFn = function(value) { this.customTrFn = function(value) {
...@@ -670,7 +669,7 @@ ...@@ -670,7 +669,7 @@
var tooltip = ''; var tooltip = '';
if (this.options.ticksValuesTooltip) { if (this.options.ticksValuesTooltip) {
tooltip = 'uib-tooltip="' + this.options.ticksValuesTooltip(value) + '"'; tooltip = 'uib-tooltip="' + this.options.ticksValuesTooltip(value) + '"';
if(this.options.vertical) if (this.options.vertical)
tooltip += ' tooltip-placement="right"' tooltip += ' tooltip-placement="right"'
} }
positions += '<span ' + tooltip + ' class="tick-value">' + this.getDisplayValue(value) + '</span>'; positions += '<span ' + tooltip + ' class="tick-value">' + this.getDisplayValue(value) + '</span>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment