// This code was generated by a tool.
-// Runtime Version:4.0.30319.0
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config
index 733d653401..383854f5fd 100644
--- a/src/Umbraco.Tests/packages.config
+++ b/src/Umbraco.Tests/packages.config
@@ -2,7 +2,7 @@
-
+
@@ -17,11 +17,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index cee705b8e8..91a0a41a10 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -36,119 +36,119 @@ Use this directive make an element sticky and follow the page when scrolling.
@param {string} scrollableContainer Set the class (".element") or the id ("#element") of the scrollable container element.
**/
-(function() {
- 'use strict';
+(function () {
+ 'use strict';
- function StickyBarDirective($rootScope) {
+ function StickyBarDirective($rootScope) {
- function link(scope, el, attr, ctrl) {
+ function link(scope, el, attr, ctrl) {
- var bar = $(el);
- var scrollableContainer = null;
- var clonedBar = null;
- var cloneIsMade = false;
- var barTop = bar.context.offsetTop;
+ var bar = $(el);
+ var scrollableContainer = null;
+ var clonedBar = null;
+ var cloneIsMade = false;
- function activate() {
+ function activate() {
- if (attr.scrollableContainer) {
- scrollableContainer = $(attr.scrollableContainer);
- } else {
- scrollableContainer = $(window);
- }
+ if (attr.scrollableContainer) {
+ scrollableContainer = $(attr.scrollableContainer);
+ } else {
+ scrollableContainer = $(window);
+ }
- scrollableContainer.on('scroll.umbStickyBar', determineVisibility).trigger("scroll");
- $(window).on('resize.umbStickyBar', determineVisibility);
+ scrollableContainer.on('scroll.umbStickyBar', determineVisibility).trigger("scroll");
+ $(window).on('resize.umbStickyBar', determineVisibility);
- scope.$on('$destroy', function() {
- scrollableContainer.off('.umbStickyBar');
- $(window).off('.umbStickyBar');
- });
-
- }
-
- function determineVisibility() {
-
- var scrollTop = scrollableContainer.scrollTop();
-
- if (scrollTop > barTop) {
-
- if (!cloneIsMade) {
-
- createClone();
-
- clonedBar.css({
- 'visibility': 'visible'
- });
-
- } else {
-
- calculateSize();
-
- }
-
- } else {
-
- if (cloneIsMade) {
-
- //remove cloned element (switched places with original on creation)
- bar.remove();
- bar = clonedBar;
- clonedBar = null;
-
- bar.removeClass('-umb-sticky-bar');
- bar.css({
- position: 'relative',
- 'width': 'auto',
- 'height': 'auto',
- 'z-index': 'auto',
- 'visibility': 'visible'
- });
-
- cloneIsMade = false;
-
- }
+ scope.$on('$destroy', function () {
+ scrollableContainer.off('.umbStickyBar');
+ $(window).off('.umbStickyBar');
+ });
}
- }
+ function determineVisibility() {
- function calculateSize() {
- clonedBar.css({
- width: bar.outerWidth(),
- height: bar.height()
- });
- }
+ var barTop = bar[0].offsetTop;
+ var scrollTop = scrollableContainer.scrollTop();
- function createClone() {
- //switch place with cloned element, to keep binding intact
- clonedBar = bar;
- bar = clonedBar.clone();
- clonedBar.after(bar);
- clonedBar.addClass('-umb-sticky-bar');
- clonedBar.css({
- 'position': 'fixed',
- 'z-index': 500,
- 'visibility': 'hidden'
- });
+ if (scrollTop > barTop) {
- cloneIsMade = true;
- calculateSize();
+ if (!cloneIsMade) {
- }
+ createClone();
- activate();
+ clonedBar.css({
+ 'visibility': 'visible'
+ });
- }
+ } else {
- var directive = {
- restrict: 'A',
- link: link
- };
+ calculateSize();
- return directive;
- }
+ }
- angular.module('umbraco.directives').directive('umbStickyBar', StickyBarDirective);
+ } else {
+
+ if (cloneIsMade) {
+
+ //remove cloned element (switched places with original on creation)
+ bar.remove();
+ bar = clonedBar;
+ clonedBar = null;
+
+ bar.removeClass('-umb-sticky-bar');
+ bar.css({
+ position: 'relative',
+ 'width': 'auto',
+ 'height': 'auto',
+ 'z-index': 'auto',
+ 'visibility': 'visible'
+ });
+
+ cloneIsMade = false;
+
+ }
+
+ }
+
+ }
+
+ function calculateSize() {
+ clonedBar.css({
+ width: bar.outerWidth(),
+ height: bar.height()
+ });
+ }
+
+ function createClone() {
+ //switch place with cloned element, to keep binding intact
+ clonedBar = bar;
+ bar = clonedBar.clone();
+ clonedBar.after(bar);
+ clonedBar.addClass('-umb-sticky-bar');
+ clonedBar.css({
+ 'position': 'fixed',
+ 'z-index': 500,
+ 'visibility': 'hidden'
+ });
+
+ cloneIsMade = true;
+ calculateSize();
+
+ }
+
+ activate();
+
+ }
+
+ var directive = {
+ restrict: 'A',
+ link: link
+ };
+
+ return directive;
+ }
+
+ angular.module('umbraco.directives').directive('umbStickyBar', StickyBarDirective);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
index b6e35d9d7b..e83bb4f14e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
@@ -77,39 +77,6 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
"Failed to retrieve data for template with alias: " + alias);
},
-
- /**
- * @ngdoc method
- * @name umbraco.resources.codefileResource#getScaffold
- * @methodOf umbraco.resources.codefileResource
- *
- * @description
- * Returns a scaffold of an empty codefile item
- *
- * The scaffold is used to build editors for code file editors that has not yet been populated with data.
- *
- * ##usage
- *
- * codefileResource.getScaffold()
- * .then(function(template) {
- * alert('its here!');
- * });
- *
- *
- * @returns {Promise} resourcePromise object containing the codefile scaffold.
- *
- */
- getScaffold: function (id) {
-
- return umbRequestHelper.resourcePromise(
- $http.get(
- umbRequestHelper.getApiUrl(
- "templateApiBaseUrl",
- "GetScaffold",
- [{ id: id }])),
- "Failed to retrieve data for empty template");
- },
-
/**
* @ngdoc method
* @name umbraco.resources.codefileResource#deleteByPath
@@ -176,7 +143,70 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
"PostSave"),
codeFile),
"Failed to save data for code file " + codeFile.virtualPath);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.codefileResource#getSnippets
+ * @methodOf umbraco.resources.codefileResource
+ *
+ * @description
+ * Gets code snippets for a given file type
+ *
+ * ##usage
+ *
+ * codefileResource.getSnippets("partialViews")
+ * .then(function(snippets) {
+ * alert('its here!');
+ * });
+ *
+ *
+ * @param {string} file type: (partialViews, partialViewMacros)
+ * @returns {Promise} resourcePromise object.
+ *
+ */
+ getSnippets: function (fileType) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "codeFileApiBaseUrl",
+ "GetSnippets?type=" + fileType )),
+ "Failed to get snippet for" + fileType);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.codefileResource#getScaffold
+ * @methodOf umbraco.resources.codefileResource
+ *
+ * @description
+ * Returns a scaffold of an empty codefile item.
+ *
+ * The scaffold is used to build editors for code file editors that has not yet been populated with data.
+ *
+ * ##usage
+ *
+ * codefileResource.getScaffold("partialViews", "Breadcrumb")
+ * .then(function(data) {
+ * alert('its here!');
+ * });
+ *
+ *
+ * @param {string} File type: (scripts, partialViews, partialViewMacros).
+ * @param {string} Snippet name (Ex. Breadcrumb).
+ * @returns {Promise} resourcePromise object.
+ *
+ */
+
+ getScaffold: function (type, id, snippetName) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "codeFileApiBaseUrl",
+ "GetScaffold?type=" + type + "&id=" + id + "&snippetName=" + snippetName)),
+ "Failed to get scaffold for" + type);
}
+
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
new file mode 100644
index 0000000000..3b3fb0f9f5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -0,0 +1,55 @@
+(function () {
+ "use strict";
+
+ function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService) {
+
+ var vm = this;
+ var node = $scope.dialogOptions.currentNode;
+
+ vm.snippets = [];
+ vm.showSnippets = false;
+ vm.creatingFolder = false;
+
+ vm.createPartialViewMacro = createPartialViewMacro;
+ vm.showCreateFolder = showCreateFolder;
+ vm.createFolder = createFolder;
+ vm.showCreateFromSnippet = showCreateFromSnippet;
+
+ function onInit() {
+ codefileResource.getSnippets('partialViewMacros')
+ .then(function(snippets) {
+ vm.snippets = snippets;
+ });
+ }
+
+ function createPartialViewMacro(selectedSnippet) {
+
+ var snippet = null;
+
+ if(selectedSnippet && selectedSnippet.fileName) {
+ snippet = selectedSnippet.fileName;
+ }
+
+ $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet);
+ navigationService.hideMenu();
+
+ }
+
+ function showCreateFolder() {
+ vm.creatingFolder = true;
+ }
+
+ function createFolder() {
+
+ }
+
+ function showCreateFromSnippet() {
+ vm.showSnippets = true;
+ }
+
+ onInit();
+
+ }
+
+ angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.CreateController", PartialViewMacrosCreateController);
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
new file mode 100644
index 0000000000..aa8796ae7a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
Create an item under {{currentNode.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Create an item under {{currentNode.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+ Add
+
+
+
+
Create an item under {{currentNode.name}}
+
+
+
+