garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

modify settings only when saving

Browse Source
This commit is contained in:
Athou
2013-04-04 13:13:08 +02:00
parent 62bc54fcb7
commit 92bc5a7586
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/js/controllers.js
View File

@@ -346,6 +346,9 @@ module.controller('ManageUserCtrl', function($scope, $state, $stateParams,
module.controller('SettingsCtrl', function($scope, $location, SettingsService) { module.controller('SettingsCtrl', function($scope, $location, SettingsService) {
$scope.settingsService = SettingsService; $scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings', function(value) {
$scope.settings = angular.copy(value);
});
$scope.codeMirrorConfig = { $scope.codeMirrorConfig = {
mode : 'css', mode : 'css',
lineNumbers : true lineNumbers : true
@@ -356,8 +359,9 @@ module.controller('SettingsCtrl', function($scope, $location, SettingsService) {
}); });
}; };
$scope.save = function() { $scope.save = function() {
SettingsService.settings = $scope.settings;
SettingsService.save(function() { SettingsService.save(function() {
$location.path('/'); window.location.href = window.location.href.substring(0, window.location.href.lastIndexOf('#'));
}); });
}; };
}); });

42
src/main/webapp/templates/settings.html
View File

@@ -2,27 +2,29 @@
<div class="page-header"> <div class="page-header">
<h1>Settings</h1> <h1>Settings</h1>
</div> </div>
<div class="row"> <form name="settingsForm" ng-submit="save()">
<div class="span2"> <div class="row">
<ul class="nav nav-pills nav-stacked"> <div class="span2">
<li class="active"><a href="#general" data-toggle="pill">General</a></li> <ul class="nav nav-pills nav-stacked">
<li><a href="#custom-css" data-toggle="pill" ng-click="refreshCodemirror=!refreshCodemirror">Custom CSS</a></li> <li class="active"><a href="#general" data-toggle="pill">General</a></li>
</ul> <li><a href="#custom-css" data-toggle="pill" ng-click="refreshCodemirror=!refreshCodemirror">Custom CSS</a></li>
</div> </ul>
<div class="span10"> </div>
<div class="tab-content"> <div class="span10">
<div class="tab-pane active" id="general" style="height: 500px"> <div class="tab-content">
Placeholder for general settings <div class="tab-pane active" id="general" style="height: 500px">
</div> Placeholder for general settings
<div class="tab-pane" id="custom-css"> </div>
<textarea ui-codemirror="codeMirrorConfig" ng-model="settingsService.settings.customCss" ui-refresh="refreshCodemirror"> <div class="tab-pane" id="custom-css">
</textarea> <textarea ui-codemirror="codeMirrorConfig" ng-model="settings.customCss" ui-refresh="refreshCodemirror">
</textarea>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="form-actions">
<div class="form-actions"> <button type="submit" class="btn btn-primary">Save</button>
<button type="button" class="btn btn-primary" ng-click="save()">Save</button> <button type="button" class="btn" ng-click="cancel()">Cancel</button>
<button type="button" class="btn" ng-click="cancel()">Cancel</button> </div>
</div> </form>
</div> </div>