Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 23:47:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop using indexes while selecting colors configs

Browse source
This commit is contained in:
Siteshwar Vashisht 2013-08-17 00:26:45 +05:30
parent c018bfdb4d
commit 6b34f19396
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
share/tools/web_config/partials/colors.html
View file

@ -1,9 +1,9 @@
<div id="master_detail_table"> <div id="master_detail_table">
<div id="master"> <div id="master">
<div ng-repeat="(name, attrs) in colorConfig"> <div ng-repeat="colorConfig in colorConfigs">
<div ng-class="{'master_element':true, 'selected_master_elem':$index==selectedColorConfig}" style="color: {{ attrs.color }}" ng-click="configClicked($index)"> <div ng-class="{'master_element':true, 'selected_master_elem': colorConfig==selectedColorConfig}" style="color: {{ colorConfig.color }}" ng-click="selectConfig(colorConfig)">
<span class="master_element_text">{{ attrs.name}}</span> <span class="master_element_text">{{ colorConfig.name}}</span>
<span class="master_element_description" style="border-bottom-color: rgb(85, 85, 85);"> {{ attrs.description }}</span> <span class="master_element_description" style="border-bottom-color: rgb(85, 85, 85);"> {{ colorConfig.description }}</span>
</div> </div>
</div> </div>
<tbody> <tbody>
@ -33,7 +33,7 @@
</tbody> </tbody>
</table> </table>
<div class="colorpicker_modifiers"> <div class="colorpicker_modifiers">
<div ng-class="{'colorpicker_modifier_cell': true, 'modifier_cell_selected': colorConfig[selectedColorConfig].underline}" id="modifier_underline" ng-style="{'text-decoration: underline': true}" onClick='picked_modifier(this)'>Underline</div> <div ng-class="{'colorpicker_modifier_cell': true, 'modifier_cell_selected': selectedColorConfig.underline}" id="modifier_underline" ng-style="{'text-decoration: underline': true}" onClick='picked_modifier(this)'>Underline</div>
</div> </div>
</div> </div>
</div> </div>

2
share/tools/web_config/partials/prompt.html
View file

@ -2,7 +2,7 @@
<div id="master"> <div id="master">
<div ng-repeat="prompt in samplePrompts"> <div ng-repeat="prompt in samplePrompts">
<div id="master_{{prompt.name}}" ng-class="{'master_element': true, 'selected_master_elem': selectedPrompt == prompt}" ng-style="selectedPrompt == prompt && {color: '#6666ff'} || {color: '#aaaaaa' }" ng-click="selectPrompt(prompt)"> <div id="master_{{prompt.name}}" ng-class="{'master_element': true, 'selected_master_elem': selectedPrompt == prompt}" ng-style="selectedPrompt == prompt && {color: '#6666ff'} || {color: '#aaaaaa' }" ng-click="selectPrompt(prompt)">
<span ng-class="{master_element_text: selectedPrompt == prompt}" ng-style="selectedPrompt == prompt && {font-size: '13pt', border-bottom-color: rgb(0, 6, 111)} || {font-size: '13pt'}">{{ prompt.name }}</span> <span ng-class="{master_element_text: selectedPrompt == prompt}" ng-style="selectedPrompt == prompt && {'font-size': '13pt', 'border-bottom-color': rgb(0, 6, 111)} || {'font-size': '13pt'}">{{ prompt.name }}</span>
</div> </div>
</div> </div>
</div> </div>

20
share/tools/web_config/webconfig.js
View file

@ -54,21 +54,21 @@ webconfig.controller("colorsController", function($scope, $http) {
return result; return result;
}; };
$scope.selectedColorConfig = 0; $scope.selectedColorConfig = null;
$scope.itemsPerRow = range(0, 15); $scope.itemsPerRow = range(0, 15);
$scope.totalRows = range(0, $scope.term256Colors.length/$scope.itemsPerRow.length); $scope.totalRows = range(0, $scope.term256Colors.length/$scope.itemsPerRow.length);
$scope.selectedCell = -1; $scope.selectedCell = null;
$scope.target = "text"; $scope.target = "text";
$scope.configClicked = function(index) { $scope.selectConfig = function(newSelection) {
$scope.selectedColorConfig = index; $scope.selectedColorConfig = newSelection;
//console.log("Color :" + $scope.colorConfig[$scope.selectedColorConfig].color.toLowerCase() + $scope.term256Colors.indexOf($scope.colorConfig[$scope.selectedColorConfig].color.toLowerCase())); //console.log("Color :" + $scope.colorConfig[$scope.selectedColorConfig].color.toLowerCase() + $scope.term256Colors.indexOf($scope.colorConfig[$scope.selectedColorConfig].color.toLowerCase()));
if ($scope.target == "background") { if ($scope.target == "background") {
$scope.selectedCell = $scope.term256Colors.indexOf($scope.colorConfig[$scope.selectedColorConfig].background.toLowerCase()); $scope.selectedCell = $scope.term256Colors.indexOf($scope.selectedColorConfig.background.toLowerCase());
} }
else { else {
$scope.selectedCell = $scope.term256Colors.indexOf($scope.colorConfig[$scope.selectedColorConfig].color.toLowerCase()); $scope.selectedCell = $scope.term256Colors.indexOf($scope.selectedColorConfig.color.toLowerCase());
} }
} }
@ -79,13 +79,15 @@ webconfig.controller("colorsController", function($scope, $http) {
$scope.pickedColorPickerTarget = function(target) { $scope.pickedColorPickerTarget = function(target) {
console.log("Picked " + target); console.log("Picked " + target);
$scope.target = target; $scope.target = target;
$scope.configClicked($scope.selectedColorConfig); // Update selection in color picker
$scope.selectConfig($scope.selectedColorConfig);
} }
$scope.fetchColors = function() { $scope.fetchColors = function() {
$http.get("/colors/").success(function(data, status, headers, config) { $http.get("/colors/").success(function(data, status, headers, config) {
$scope.colorConfig= data; $scope.colorConfigs = data;
$scope.selectedCell = $scope.term256Colors.indexOf($scope.colorConfig[$scope.selectedColorConfig].color); $scope.selectedColorConfig = data[0];
$scope.selectedCell = $scope.term256Colors.indexOf($scope.selectedColorConfig.color);
})}; })};
$scope.fetchColors(); $scope.fetchColors();
}); });