Bump version to v1.7.5

Fix for #268
Add Umbraco as a dependency
2015-05-11 15:32:46 -04:00 · 2015-05-11 15:31:46 -04:00 · 2015-05-11 15:20:28 -04:00 · 2015-05-04 13:46:07 -04:00 · 2015-05-04 13:45:49 -04:00 · 2015-05-03 16:41:41 -04:00
10 changed files with 48 additions and 37 deletions
@@ -74,7 +74,7 @@ module.exports = function(grunt) {
        expand: true
      },
      dll: {
-        cwd: 'app/Umbraco/Umbraco.Archetype/bin/Release/',
+        cwd: 'app/Umbraco/Umbraco.Archetype/bin/Debug/',
        src: 'Archetype.dll',
        dest: '<%= dest %>/bin/',
        expand: true
@@ -164,7 +164,7 @@ module.exports = function(grunt) {

    assemblyinfo: {
      options: {
-        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
+        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Umbraco.Archetype/Archetype.Courier.csproj'],
        filename: 'VersionInfo.cs',
        info: {
          version: '<%= (pkgMeta.version.indexOf("-") > 0 ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 
@@ -200,9 +200,9 @@ module.exports = function(grunt) {
        }
      },
      dist: {
-        src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
+        src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj','app/Umbraco/Archetype.Courier/Archetype.Courier.csproj'],
        options: {
-          projectConfiguration: 'Release',
+          projectConfiguration: 'Debug',
          targets: ['Clean', 'Rebuild'],
        }
      }
@@ -34,7 +34,7 @@ namespace Archetype.Models

            // Try Umbraco's PropertyValueConverters
            var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty<IPropertyValueConverter>();
-            if (converters.Any())
+            if (!string.IsNullOrWhiteSpace(this.PropertyEditorAlias) && converters.Any())
            {
                var convertedAttempt = TryConvertWithPropertyValueConverters<T>(Value, converters);
                if (convertedAttempt.Success)
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("1.7.3")]
-[assembly: AssemblyFileVersion("1.7.3")]
+[assembly: AssemblyVersion("1.7.5")]
+[assembly: AssemblyFileVersion("1.7.5")]
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Archetype.Extensions;
 using ClientDependency.Core;
 using Newtonsoft.Json;
@@ -56,13 +57,11 @@ namespace Archetype.PropertyEditors
 				if (property.Value == null || property.Value.ToString() == "")
 					return string.Empty;

-                //LogHelper.Info<ArchetypeHelper>(property.Value.ToString());
-
 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);

 				foreach (var fieldset in archetype.Fieldsets)
 				{
-					foreach (var propDef in fieldset.Properties)
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
 					{
                        try
                        {
@@ -86,15 +85,13 @@ namespace Archetype.PropertyEditors
 			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
 			{
 				if (property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
-
-                //LogHelper.Info<ArchetypeHelper>(property.Value.ToString());
+					return string.Empty;;

 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);

 				foreach (var fieldset in archetype.Fieldsets)
 				{
-					foreach (var propDef in fieldset.Properties)
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
 					{
                        try
                        {
@@ -118,13 +115,11 @@ namespace Archetype.PropertyEditors
 				if (editorValue.Value == null || editorValue.Value.ToString() == "")
 					return string.Empty;

-                //LogHelper.Info<ArchetypeHelper>(editorValue.Value.ToString());
-
 				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);

 				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties)
+				{    
+                    foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
 					{
                        try
                        {
@@ -87,22 +87,31 @@
        return "";
    }

+    var draggedRteSettings;
+
    //sort config
    $scope.sortableOptions = {
        axis: 'y',
        cursor: "move",
        handle: ".handle",
        start: function(ev, ui) {
-            ui.item.parent().find('.umb-rte textarea').each(function () {
-                tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
+            draggedRteSettings = {};
+            ui.item.parent().find('.mceNoEditor').each(function () {
+                // remove all RTEs in the dragged row and save their settings
+                var id = $(this).attr('id');
+                draggedRteSettings[id] = _.findWhere(tinyMCE.editors, { id: id }).settings;
+                tinyMCE.execCommand('mceRemoveEditor', false, id);
            });
        },
        update: function (ev, ui) {
            $scope.setDirty();
        },
        stop: function (ev, ui) {
-            ui.item.parent().find('.umb-rte textarea').each(function () {
-                tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
+            ui.item.parent().find('.mceNoEditor').each(function () {
+                var id = $(this).attr('id');
+                draggedRteSettings[id] = draggedRteSettings[id] || _.findWhere(tinyMCE.editors, { id: id }).settings;
+                tinyMCE.execCommand('mceRemoveEditor', false, id);
+                tinyMCE.init(draggedRteSettings[id]);
            });
        }
    };
@@ -226,7 +226,10 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c

                    scope.$on('archetypeFormSubmitting', function (ev, args) {
                        // did the value change (if it did, it most likely did so during the "formSubmitting" event)
-                        var currentValue = getFieldsetProperty(scope).value;
+                        var property = getFieldsetProperty(scope);
+
+                        var currentValue = property.value;
+
                        if (currentValue != scope.model.value) {
                            getFieldsetProperty(scope).value = scope.model.value;

@@ -181,6 +181,7 @@

    .archetypeAddButton:hover {
        text-decoration: none;
+        cursor: pointer;

        .archetypeAddButtonText {
            text-decoration: underline;
@@ -49,7 +49,7 @@
        </li>
    </ul>
    <div ng-show="showAddButton()">
-        <a data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(model.config.fieldsets[0].alias, 0) : return" prevent-default>
+        <a class="archetypeAddButton" data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(model.config.fieldsets[0].alias, 0) : return" prevent-default>
            <i class="icon icon-add dropdown-toggle"></i>
            <localize key="general_add" class="archetypeAddButtonText">Add</localize>
        </a>
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.7.3",
+	"version": "1.7.5",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",
@@ -1,15 +1,18 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-        <metadata>
-                <id>Archetype</id>
-                <version><%= version %></version>
-                <title><%= name %></title>
-                <authors>imulus, kgiszewski, tomfulton</authors>
-                <owners>imulus, kgiszewski, tomfulton</owners>
-                <projectUrl>http://github.com/imulus/archetype</projectUrl>
-                <description><![CDATA[Archetype for Umbraco]]></description>
-                <tags>umbraco</tags>
-                <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
-                <licenseUrl><%= licenseUrl %></licenseUrl>
-        </metadata>
+    <metadata>
+        <id>Archetype</id>
+        <version><%= version %></version>
+        <title><%= name %></title>
+        <authors>imulus, kgiszewski, tomfulton</authors>
+        <owners>imulus, kgiszewski, tomfulton</owners>
+        <projectUrl>http://github.com/imulus/archetype</projectUrl>
+        <description><![CDATA[Archetype for Umbraco]]></description>
+        <tags>umbraco</tags>
+        <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
+        <licenseUrl><%= licenseUrl %></licenseUrl>
+        <dependencies>
+            <dependency id="UmbracoCms.Core" version="7.1.6" />
+        </dependencies>
+    </metadata>
 </package>
Author	SHA1	Message	Date
kgiszewski	9bbf366fe2	Bump version to v1.7.5	2015-05-11 15:32:46 -04:00
kgiszewski	368a9f6c07	Fix for #268	2015-05-11 15:31:46 -04:00
kgiszewski	d3b3f80f3d	Add Umbraco as a dependency	2015-05-11 15:20:28 -04:00
kgiszewski	11f7881dd7	Merge branch 'master' of github.com:imulus/Archetype	2015-05-04 13:46:07 -04:00
kgiszewski	9894357469	Fix #268 (This is a temp fix until a better solution can be found)	2015-05-04 13:45:49 -04:00
kgiszewski	146a3770a1	Bump version to v1.7.4	2015-05-03 16:41:41 -04:00
kgiszewski	caf9d1ac15	Fix grunt for debug	2015-04-29 08:53:18 -04:00
kgiszewski	614595ceb3	Finesse PR #269	2015-04-29 08:53:05 -04:00
kgiszewski	d1b21a1ca7	Merge branch 'pr/269'	2015-04-29 08:13:40 -04:00
kgiszewski	54bc507049	Merge branch 'pr/267'	2015-04-29 08:12:56 -04:00
kgiszewski	037585458c	Merge branch 'pr/266'	2015-04-29 08:12:15 -04:00
kgiszewski	f52649eb9e	Add Courier to the build process for distro	2015-04-29 08:08:08 -04:00
kgiszewski	423fedb954	Undo add Courier to distro per @leekelleher 's suggestion that it causes a ysod if Courier is not installed already	2015-04-29 07:46:37 -04:00
Kim Pilgaard	b39312ccd2	Properties which no longer exist have no GUID. Remove these when reading and writing the data.	2015-04-29 08:56:17 +02:00
Gavin Faux	b9c4be0bb6	PropertyEditorAlias null check Don't try `PropertyValueConverters` for properties with null or empty `PropertyEditorAlias`, prevents `System.NullReferenceException` in `PropertyValueConverter.IsConverter` implementations	2015-04-28 14:30:08 +01:00
Tom Van Rompaey	29285607a9	Small UX update for add button Added class "archetypeAddButton" to the button so it can make use of the CSS that is writen for it. The button should also have a cursor: pointer on hover.	2015-04-25 16:16:04 +02:00
kgiszewski	909b87cea0	Add Courier dll to the distribution	2015-04-21 08:43:44 -04:00