diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js deleted file mode 100644 index 4cf8930596..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js +++ /dev/null @@ -1,76 +0,0 @@ -app.config(function ($routeProvider) { - $routeProvider - .when('/framed/:url', { - //This occurs when we need to launch some content in an iframe - templateUrl: function (rp) { - if (!rp.url) - throw "A framed resource must have a url route parameter"; - - return 'views/common/legacy.html'; - } - }) - .when('/:section', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/:section/:tree', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - if (rp.tree === "") - { - rp.tree = "default"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/:section/:tree/:method', { - templateUrl: function(rp) { - if (!rp.method){ - return "views/common/dashboard.html"; - } - - if(rp.tree === "default" || rp.tree === ""){ - return 'views/' + rp.section + '/' + rp.method + '.html'; - }else{ - return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; - } - } - }) - .when('/:section/:tree/:method/:id', { - templateUrl: function (rp) { -<<<<<<< HEAD - return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; -======= - if (!rp.method) - return "views/common/dashboard.html"; - - return 'views/' + rp.section + '/' + rp.method + '.html'; ->>>>>>> 4a8026c902fd1f6afa32749882611c7e4d37e882 - } - }) - .otherwise({ redirectTo: '/content/document' }); - }).config(function ($locationProvider) { - - //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off - // $locationProvider.html5Mode(true); //turn html5 mode on -}); - - -app.run(['userService', function (userService) { - // Get the current user when the application starts - // (in case they are still logged in from a previous session) - userService.isAuthenticated(); -}]); diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js deleted file mode 100644 index 799f375557..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js +++ /dev/null @@ -1,56 +0,0 @@ -app.config(function ($routeProvider) { - $routeProvider - .when('/:section', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/framed/:url', { - //This occurs when we need to launch some content in an iframe - templateUrl: function (rp) { - if (!rp.url) - throw "A framed resource must have a url route parameter"; - - return 'views/common/legacy.html'; - } - }) - .when('/:section/:method', { - templateUrl: function(rp) { - if (!rp.method) - return "views/common/dashboard.html"; - - return 'views/' + rp.section + '/' + rp.method + '.html'; - } - }) - .when('/:section/:method/:id', { - templateUrl: function (rp) { - if (!rp.method) - return "views/common/dashboard.html"; - - ////here we detect recycle bins, all recycle bins start with -2* (i.e. -20, -21) - //if (rp.id.startsWith("-2")) { - // return 'views/' + rp.section + '/recyclebin.html'; - //} - - return 'views/' + rp.section + '/' + rp.method + '.html'; - } - }) - .otherwise({ redirectTo: '/content' }); - }).config(function ($locationProvider) { - - //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off - // $locationProvider.html5Mode(true); //turn html5 mode on -}); - - -app.run(['userService', function (userService) { - // Get the current user when the application starts - // (in case they are still logged in from a previous session) - userService.isAuthenticated(); -}]); diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js deleted file mode 100644 index 34f194e94f..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js +++ /dev/null @@ -1,69 +0,0 @@ -app.config(function ($routeProvider) { - $routeProvider - .when('/framed/:url', { - //This occurs when we need to launch some content in an iframe - templateUrl: function (rp) { - if (!rp.url) - throw "A framed resource must have a url route parameter"; - - return 'views/common/legacy.html'; - } - }) - .when('/:section', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/:section/:tree', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - if (rp.tree === "") - { - rp.tree = "default"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/:section/:tree/:method', { - templateUrl: function(rp) { - if (!rp.method){ - return "views/common/dashboard.html"; - } - - if(rp.tree === "default" || rp.tree === ""){ - return 'views/' + rp.section + '/' + rp.method + '.html'; - }else{ - return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; - } - } - }) - .when('/:section/:tree/:method/:id', { - templateUrl: function (rp) { - return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; - } - }) - .otherwise({ redirectTo: '/content/document' }); - }).config(function ($locationProvider) { - - //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off - // $locationProvider.html5Mode(true); //turn html5 mode on -}); - - -app.run(['userService', function (userService) { - // Get the current user when the application starts - // (in case they are still logged in from a previous session) - userService.isAuthenticated(); -}]); diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js deleted file mode 100644 index 3ff78c119b..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js +++ /dev/null @@ -1,51 +0,0 @@ -app.config(function ($routeProvider) { - $routeProvider - .when('/:section', { - templateUrl: function (rp) { - if (rp.section === "default") - { - rp.section = "content"; - } - - rp.url = "dashboard.aspx?app=" + rp.section; - return 'views/common/legacy.html'; - } - }) - .when('/framed/:url', { - //This occurs when we need to launch some content in an iframe - templateUrl: function (rp) { - if (!rp.url) - throw "A framed resource must have a url route parameter"; - - return 'views/common/legacy.html'; - } - }) - .when('/:section/:method', { - templateUrl: function(rp) { - if (!rp.method) - return "views/common/dashboard.html"; - - return 'views/' + rp.section + '/' + rp.method + '.html'; - } - }) - .when('/:section/:method/:id', { - templateUrl: function (rp) { - if (!rp.method) - return "views/common/dashboard.html"; - - return 'views/' + rp.section + '/' + rp.method + '.html'; - } - }) - .otherwise({ redirectTo: '/content' }); - }).config(function ($locationProvider) { - - //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off - // $locationProvider.html5Mode(true); //turn html5 mode on -}); - - -app.run(['userService', function (userService) { - // Get the current user when the application starts - // (in case they are still logged in from a previous session) - userService.isAuthenticated(); -}]);