yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactors out ui.tablet into private variable - only navigationService needs to know about this, otherwise if everything does it needs to go into appState and the listener needs to go elsewhere (a directive)

Browse Source
This commit is contained in:
Shannon
2013-11-13 18:44:44 +11:00
parent 4fe6da9118
commit 36c21ca322
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -20,11 +20,12 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
var minScreenSize = 1100;
//used to track the current dialog object
var currentDialog = null;
//tracks the screen size as a tablet
var isTablet = false;
//TODO: Once most of the state vars have been refactored out to use appState, this UI object will be internal ONLY and will not be
// exposed from this service.
var ui = {
tablet: false,
var ui = {
currentPath: undefined,
currentTree: undefined,
treeEventHandler: undefined,
@@ -35,9 +36,9 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
};
function setTreeMode() {
ui.tablet = ($(window).width() <= minScreenSize);
isTablet = ($(window).width() <= minScreenSize);
appState.setGlobalState("showNavigation", !ui.tablet);
appState.setGlobalState("showNavigation", !isTablet);
}
function setMode(mode) {
@@ -88,7 +89,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
appState.setGlobalState("stickyNavigation", false);
appState.setGlobalState("showTray", false);
if (ui.tablet) {
if (isTablet) {
appState.setGlobalState("showNavigation", false);
}
@@ -104,8 +105,6 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
/** initializes the navigation service */
init: function() {
//TODO: detect tablet mode, subscribe to window resizing
//for now we just hardcode it to non-tablet mode
setTreeMode();
//keep track of the current section - initially this will always be undefined so
@@ -402,7 +401,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
*/
hideTree: function() {
if (this.ui.tablet && !appState.getGlobalState("stickyNavigation")) {
if (isTablet && !appState.getGlobalState("stickyNavigation")) {
//reset it to whatever is in the url
appState.setSectionState("currentSection", $routeParams.section);
setMode("default-hidesectiontree");