diff --git a/js/app/Config.js b/js/app/Config.js index f1330ddb3..dc0f2f7db 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -20,57 +20,58 @@ * */ +/** global: oc_requesttoken, markdownitLinkTarget */ + app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) { - 'use strict'; - $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken; + 'use strict'; + $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken; - $compileProvider.debugInfoEnabled(true); + $compileProvider.debugInfoEnabled(true); - markdownItConverterProvider.config({ - breaks: true, - linkify: true, - xhtmlOut: true - }); - markdownItConverterProvider.use(markdownitLinkTarget); + markdownItConverterProvider.config({ + breaks: true, + linkify: true, + xhtmlOut: true + }); + markdownItConverterProvider.use(markdownitLinkTarget); - $urlRouterProvider.otherwise('/'); + $urlRouterProvider.otherwise('/'); - $stateProvider - .state('list', { - url: '/:filter', - templateUrl: '/boardlist.mainView.html', - controller: 'ListController', + $stateProvider + .state('list', { + url: '/:filter', + templateUrl: '/boardlist.mainView.html', + controller: 'ListController', reloadOnSearch: false, params: { - filter: { value: '', dynamic: true } - } + filter: {value: '', dynamic: true} + } }) - .state('board', { - url: '/board/:boardId/:filter', - templateUrl: '/board.html', - controller: 'BoardController', - params: { - filter: { value: '', dynamic: true } - } - }) - .state('board.detail', { - url: '/detail/', - reloadOnSearch : false, - views: { - 'sidebarView': { - templateUrl: '/board.sidebarView.html' + .state('board', { + url: '/board/:boardId/:filter', + templateUrl: '/board.html', + controller: 'BoardController', + params: { + filter: {value: '', dynamic: true} + } + }) + .state('board.detail', { + url: '/detail/', + reloadOnSearch: false, + views: { + 'sidebarView': { + templateUrl: '/board.sidebarView.html' } - } + } }) - .state('board.card', { - url: '/card/:cardId', - views: { - 'sidebarView': { - templateUrl: '/card.sidebarView.html', - controller: 'CardController' - } - } - }); - + .state('board.card', { + url: '/card/:cardId', + views: { + 'sidebarView': { + templateUrl: '/card.sidebarView.html', + controller: 'CardController' + } + } + }); }); \ No newline at end of file diff --git a/js/app/Run.js b/js/app/Run.js index 9924ad384..269378f6b 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -20,57 +20,58 @@ * */ +/** global: OC, oc_defaults, Snap */ app.run(function ($document, $rootScope, $transitions, BoardService) { - 'use strict'; - $document.click(function (event) { - $rootScope.$broadcast('documentClicked', event); - }); - $transitions.onEnter({from: 'list'}, function($state, $transition$) { - BoardService.unsetCurrrent(); - }); - $transitions.onEnter({to: 'list'}, function($state, $transition$) { + 'use strict'; + $document.click(function (event) { + $rootScope.$broadcast('documentClicked', event); + }); + $transitions.onEnter({from: 'list'}, function ($state, $transition$) { + BoardService.unsetCurrrent(); + }); + $transitions.onEnter({to: 'list'}, function ($state, $transition$) { BoardService.unsetCurrrent(); document.title = "Deck - " + oc_defaults.name; }); - $transitions.onEnter({to: 'board.card'}, function ($state, $transition$) { - $rootScope.sidebar.show = true; - }); - $transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) { - $rootScope.sidebar.show = true; - }); - $transitions.onEnter({to: 'board'}, function ($state) { - $rootScope.sidebar.show = false; - }); - $transitions.onExit({from: 'board.card'}, function ($state) { - $rootScope.sidebar.show = false; - }); - $transitions.onExit({from: 'board.detail'}, function ($state) { - $rootScope.sidebar.show = false; - }); + $transitions.onEnter({to: 'board.card'}, function ($state, $transition$) { + $rootScope.sidebar.show = true; + }); + $transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) { + $rootScope.sidebar.show = true; + }); + $transitions.onEnter({to: 'board'}, function ($state) { + $rootScope.sidebar.show = false; + }); + $transitions.onExit({from: 'board.card'}, function ($state) { + $rootScope.sidebar.show = false; + }); + $transitions.onExit({from: 'board.detail'}, function ($state) { + $rootScope.sidebar.show = false; + }); - $('link[rel="shortcut icon"]').attr( - 'href', - OC.filePath('deck', 'img', 'app-512.png') - ); + $('link[rel="shortcut icon"]').attr( + 'href', + OC.filePath('deck', 'img', 'app-512.png') + ); - $('#app-navigation-toggle').off('click'); - // App sidebar on mobile - var snapper = new Snap({ - element: document.getElementById('app-content'), - disable: 'right', - maxPosition: 250, - touchToDrag: false - }); + $('#app-navigation-toggle').off('click'); + // App sidebar on mobile + var snapper = new Snap({ + element: document.getElementById('app-content'), + disable: 'right', + maxPosition: 250, + touchToDrag: false + }); - $('#app-navigation-toggle').click(function(){ - if($(window).width() > 768) { - $('#app-navigation').toggle('hidden'); - } else { - if(snapper.state().state === 'left'){ - snapper.close(); - } else { - snapper.open('left'); - } - } - }); + $('#app-navigation-toggle').click(function () { + if ($(window).width() > 768) { + $('#app-navigation').toggle('hidden'); + } else { + if (snapper.state().state === 'left') { + snapper.close(); + } else { + snapper.open('left'); + } + } + }); });