Skip to content

Commit f52de65

Browse files
bergmaniabergmania
committed
Fixed more casing issues..
1 parent 60a179c commit f52de65

File tree

18 files changed

+447
-447
lines changed

18 files changed

+447
-447
lines changed

‎src/Umbraco.Web.UI.Client/package-lock.json

Lines changed: 378 additions & 378 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
localizationService.localizeMany(keys)
5656
.then(function (data) {
57-
[labels.deleted,
58-
labels.unpublished,
57+
[labels.deleted,
58+
labels.unpublished,
5959
labels.published,
6060
labels.publishedPendingChanges,
6161
labels.notCreated,
@@ -97,7 +97,7 @@
9797

9898
// Declare a fallback URL for the <umb-node-preview/> directive
9999
if (scope.documentType !== null) {
100-
scope.previewOpenUrl = '#/settings/documenttypes/edit/' + scope.documentType.id;
100+
scope.previewOpenUrl = '#/settings/documentTypes/edit/' + scope.documentType.id;
101101
}
102102

103103
var activeApp = _.find(scope.node.apps, (a) => a.active);

‎src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
648648
"/backoffice/" + treeAlias + "/" + action + ".html");
649649
}
650650
else {
651-
return ("views/" + treeAlias + "/" + action + ".html").toLowerCase();
651+
return "views/" + treeAlias + "/" + action + ".html";
652652
}
653653
},
654654

‎src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
function onInit() {
1919

20-
/* make a copy of the init model so it is possible to roll
20+
/* make a copy of the init model so it is possible to roll
2121
back the changes on cancel */
2222
oldModel = Utilities.copy($scope.model);
2323

@@ -29,7 +29,7 @@
2929
vm.availableGroups = $filter("orderBy")(
3030
_.map(
3131
_.groupBy($scope.model.availableCompositeContentTypes, function (compositeContentType) {
32-
32+
3333
compositeContentType.selected = isSelected(compositeContentType.contentType.alias);
3434

3535
return compositeContentType.contentType.metaData.containerPath;
@@ -44,7 +44,7 @@
4444
});
4545
}
4646

47-
47+
4848
function isSelected(alias) {
4949
if ($scope.model.contentType.compositeContentTypes.indexOf(alias) !== -1) {
5050
return true;
@@ -53,13 +53,13 @@
5353
}
5454

5555
function openContentType(contentType, section) {
56-
var url = (section === "documentType" ? "/settings/documenttypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
56+
var url = (section === "documentType" ? "/settings/documentTypes/edit/" : "/settings/mediaTypes/edit/") + contentType.id;
5757
$location.path(url);
5858
}
5959

6060
function selectCompositeContentType(compositeContentType) {
6161
vm.loadingAlias = compositeContentType.contentType.alias
62-
62+
6363
var contentType = compositeContentType.contentType;
6464

6565
$scope.model.selectCompositeContentType(contentType).then(function (response) {

‎src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ function contentCreateController($scope,
115115
};
116116

117117
$scope.createContentType = function () {
118-
$location.path("/settings/documenttypes/edit/-1").search("create", "true");
118+
$location.path("/settings/documentTypes/edit/-1").search("create", "true");
119119
close();
120120
};
121121

122122
$scope.editContentType = function () {
123-
$location.path("/settings/documenttypes/edit/" + $scope.contentTypeId).search("view", "permissions");
123+
$location.path("/settings/documentTypes/edit/" + $scope.contentTypeId).search("view", "permissions");
124124
close();
125125
};
126126

‎src/Umbraco.Web.UI.Client/src/views/dataTypes/create.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ function DataTypeCreateController($scope, $location, navigationService, dataType
4040

4141
$scope.createDataType = function() {
4242
$location.search('create', null);
43-
$location.path("/" + section + "/datatypes/edit/" + node.id).search("create", "true");
43+
$location.path("/" + section + "/dataTypes/edit/" + node.id).search("create", "true");
4444
navigationService.hideMenu();
4545
};
4646

4747
$scope.close = function() {
4848
const showMenu = true;
4949
navigationService.hideDialog(showMenu);
5050
};
51-
51+
5252
}
5353

5454
angular.module('umbraco').controller("Umbraco.Editors.DataType.CreateController", DataTypeCreateController);

‎src/Umbraco.Web.UI.Client/src/views/dataTypes/datatype.edit.controller.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* The controller for the content editor
88
*/
99
function DataTypeEditController($scope, $routeParams, appState, navigationService, dataTypeResource, serverValidationManager, contentEditingHelper, formHelper, editorState, dataTypeHelper, eventsService, localizationService) {
10-
10+
1111
var evts = [];
1212
var vm = this;
1313

@@ -33,21 +33,21 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
3333

3434
//setup the pre-values as props
3535
vm.preValues = [];
36-
37-
36+
37+
3838
//method used to configure the pre-values when we retrieve them from the server
3939
function createPreValueProps(preVals) {
4040
vm.preValues = dataTypeHelper.createPreValueProps(preVals);
4141
}
42-
43-
42+
43+
4444
function setHeaderNameState(content) {
4545
if(content.isSystem == 1) {
4646
vm.page.nameLocked = true;
4747
}
4848
}
49-
50-
49+
50+
5151
function loadDataType() {
5252

5353
vm.page.loading = true;
@@ -73,7 +73,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
7373
// if there are any and then clear them so the collection no longer persists them.
7474
serverValidationManager.notifyAndClearAllSubscriptions();
7575

76-
navigationService.syncTree({ tree: "datatypes", path: data.path }).then(function (syncArgs) {
76+
navigationService.syncTree({ tree: "dataTypes", path: data.path }).then(function (syncArgs) {
7777
vm.page.menu.currentNode = syncArgs.node;
7878
});
7979

@@ -107,7 +107,7 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
107107
//share state
108108
editorState.set(vm.content);
109109

110-
navigationService.syncTree({ tree: "datatypes", path: data.path, forceReload: true }).then(function (syncArgs) {
110+
navigationService.syncTree({ tree: "dataTypes", path: data.path, forceReload: true }).then(function (syncArgs) {
111111
vm.page.menu.currentNode = syncArgs.node;
112112
});
113113

@@ -132,13 +132,13 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
132132
}
133133

134134
};
135-
135+
136136
vm.save = saveDataType;
137-
137+
138138
evts.push(eventsService.on("app.refreshEditor", function(name, error) {
139139
loadDataType();
140140
}));
141-
141+
142142
//ensure to unregister from all events!
143143
$scope.$on('$destroy', function () {
144144
for (var e in evts) {
@@ -147,9 +147,9 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
147147
});
148148

149149
function init() {
150-
150+
151151
$scope.$watch("vm.content.selectedEditor", function (newVal, oldVal) {
152-
152+
153153
//when the value changes, we need to dynamically load in the new editor
154154
if (newVal && (newVal != oldVal && (oldVal || $routeParams.create))) {
155155
//we are editing so get the content item from the server
@@ -159,20 +159,20 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
159159
vm.preValuesLoaded = true;
160160
vm.content.preValues = data;
161161
createPreValueProps(vm.content.preValues);
162-
162+
163163
setHeaderNameState(vm.content);
164-
164+
165165
//share state
166166
editorState.set(vm.content);
167167
});
168168
}
169169
});
170-
170+
171171
if ($routeParams.create) {
172-
172+
173173
vm.page.loading = true;
174174
vm.showIdentifier = false;
175-
175+
176176
//we are creating so get an empty data type item
177177
dataTypeResource.getScaffold($routeParams.id)
178178
.then(function(data) {
@@ -192,14 +192,14 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic
192192
else {
193193
loadDataType();
194194
}
195-
195+
196196
var labelKeys = [
197197
"general_settings",
198198
"general_info"
199199
];
200-
200+
201201
localizationService.localizeMany(labelKeys).then(function (values) {
202-
202+
203203
vm.page.navigation = [
204204
{
205205
"name": values[0],

‎src/Umbraco.Web.UI.Client/src/views/dataTypes/rename.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<div class="umb-pane">
55
<form novalidate name="renameFolderForm"
6-
ng-submit="renameContainer('dataTypeResource', 'datatypes')"
6+
ng-submit="renameContainer('dataTypeResource', 'dataTypes')"
77
val-form-manager>
88

99
<div ng-show="error">

‎src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
3434
var currPath = node.path ? node.path : "-1";
3535

3636
navigationService.syncTree({
37-
tree: "documenttypes",
37+
tree: "documentTypes",
3838
path: currPath + "," + folderId,
3939
forceReload: true,
4040
activate: true
@@ -51,38 +51,38 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
5151

5252
});
5353
}
54-
};
54+
};
5555

5656
// Disabling logic for creating document type with template if disableTemplates is set to true
5757
if (!disableTemplates) {
5858
$scope.createDocType = function () {
5959
$location.search('create', null);
6060
$location.search('notemplate', null);
61-
$location.path("/settings/documenttypes/edit/" + node.id).search("create", "true");
61+
$location.path("/settings/documentTypes/edit/" + node.id).search("create", "true");
6262
navigationService.hideMenu();
6363
};
6464
}
6565

6666
$scope.createComponent = function () {
6767
$location.search('create', null);
6868
$location.search('notemplate', null);
69-
$location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true");
69+
$location.path("/settings/documentTypes/edit/" + node.id).search("create", "true").search("notemplate", "true");
7070
navigationService.hideMenu();
7171
};
7272

7373
$scope.createComposition = function () {
7474
$location.search('create', null);
7575
$location.search('notemplate', null);
7676
$location.search('iscomposition', null);
77-
$location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iscomposition", "true");
77+
$location.path("/settings/documentTypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iscomposition", "true");
7878
navigationService.hideMenu();
7979
};
8080

8181
$scope.createElement = function () {
8282
$location.search('create', null);
8383
$location.search('notemplate', null);
8484
$location.search('iselement', null);
85-
$location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iselement", "true");
85+
$location.path("/settings/documentTypes/edit/" + node.id).search("create", "true").search("notemplate", "true").search("iselement", "true");
8686
navigationService.hideMenu();
8787
};
8888

‎src/Umbraco.Web.UI.Client/src/views/documentTypes/edit.controller.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
}).then(function (data) {
358358
// allow UI to access server validation state
359359
vm.contentType.ModelState = data.ModelState;
360-
360+
361361
//success
362362
// we don't need to sync the tree in infinite mode
363363
if (!infiniteMode) {
@@ -367,7 +367,7 @@
367367
// emit event
368368
var args = { documentType: vm.contentType };
369369
eventsService.emit("editors.documentType.saved", args);
370-
370+
371371
if (documentTypeIcon !== vm.contentType.icon) {
372372
eventsService.emit("editors.tree.icon.changed", args);
373373
}
@@ -426,7 +426,7 @@
426426
editorState.set(contentType);
427427

428428
vm.contentType = contentType;
429-
429+
430430
documentTypeIcon = contentType.icon;
431431

432432
loadButtons();
@@ -466,7 +466,7 @@
466466

467467
/** Syncs the content type to it's tree node - this occurs on first load and after saving */
468468
function syncTreeNode(dt, path, initialLoad) {
469-
const args = { tree: "documenttypes", path: path.split(","), forceReload: initialLoad !== true };
469+
const args = { tree: "documentTypes", path: path.split(","), forceReload: initialLoad !== true };
470470
navigationService.syncTree(args)
471471
.then(function (syncArgs) {
472472
vm.currentNode = syncArgs.node;
@@ -513,7 +513,7 @@
513513
}
514514
});
515515

516-
// #3368 - changes on the other "buttons" do not register on the current form, so we manually have to flag the form as dirty
516+
// #3368 - changes on the other "buttons" do not register on the current form, so we manually have to flag the form as dirty
517517
$scope.$watch(
518518
"vm.contentType.allowedContentTypes.length + vm.contentType.allowAsRoot + vm.contentType.allowCultureVariant + vm.contentType.isElement + " +
519519
"vm.contentType.allowedTemplates.length + vm.contentType.isContainer + vm.contentType.compositeContentTypes.length",

0 commit comments

Comments
 (0)