diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-27 10:25:27 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-27 15:55:51 +0200 |
commit | 6691ca6f8d93837feb6e4ed0309ace031233737d (patch) | |
tree | 9ceb4dea5a32eba45ff53e5e6a600155a01dd934 | |
parent | Support limit and feedback param of initialSync (diff) | |
download | synapse-6691ca6f8d93837feb6e4ed0309ace031233737d.tar.xz |
Rename go() into goToPage() which is available from everywhere thanks to the inheritance of $scope
Diffstat (limited to '')
-rw-r--r-- | webclient/app-controller.js | 6 | ||||
-rw-r--r-- | webclient/index.html | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index f210119e21..5d3fa6ddc8 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -37,7 +37,11 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even mPresence.start(); } - $scope.go = function(url) { + /** + * Open a given page. + * @param {String} url url of the page + */ + $scope.goToPage = function(url) { $location.url(url); }; diff --git a/webclient/index.html b/webclient/index.html index 6031036e9a..86dbb65e1e 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -37,7 +37,7 @@ <header id="header"> <!-- Do not show buttons on the login page --> <div id="header-buttons" ng-hide="'/login' == location "> - <button ng-click='go("settings")'>Settings</button> + <button ng-click='goToPage("settings")'>Settings</button> <button ng-click="logout()">Log out</button> </div> </header> |