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

Nearly got the whole nav.ui stuff taken care of, have most of the correct objects in appState, fixed up tree syncing with move dialog, fixed up state handling of the currently selected node, removed setting the navigationController's scope from within the navigationService (?), still some more stuff to clean up.

Browse Source
This commit is contained in:
Shannon
2013-11-14 18:50:31 +11:00
parent 6967027e41
commit b6dcbc83e4
7 changed files with 118 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
View File

@@ -83,6 +83,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
mainTree: function() {
var injector = getRootInjector();
var navService = injector.get("navigationService");
var appState = injector.get("appState");
var angularHelper = injector.get("angularHelper");
var $rootScope = injector.get("$rootScope");
@@ -116,9 +117,10 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
},
moveNode: function (id, path) {
angularHelper.safeApply($rootScope, function() {
if (navService.ui.currentNode) {
var currentMenuNode = appState.getMenuState("currentNode");
if (currentMenuNode) {
var treeService = injector.get("treeService");
var treeRoot = treeService.getTreeRoot(navService.ui.currentNode);
var treeRoot = treeService.getTreeRoot(currentMenuNode);
if (treeRoot) {
var found = treeService.getDescendantNode(treeRoot, id);
if (found) {
@@ -131,12 +133,17 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
},
getActionNode: function () {
//need to replicate the legacy tree node
var currentMenuNode = appState.getMenuState("currentNode");
if (!currentMenuNode) {
return null;
}
var legacyNode = {
nodeId: navService.ui.currentNode.id,
nodeName: navService.ui.currentNode.name,
nodeType: navService.ui.currentNode.nodeType,
treeType: navService.ui.currentNode.nodeType,
sourceUrl: navService.ui.currentNode.childNodesUrl,
nodeId: currentMenuNode.id,
nodeName: currentMenuNode.name,
nodeType: currentMenuNode.nodeType,
treeType: currentMenuNode.nodeType,
sourceUrl: currentMenuNode.childNodesUrl,
updateDefinition: function() {
throw "'updateDefinition' method is not supported in Umbraco 7, consider upgrading to the new v7 APIs";
}