Bump version to v1.7.5

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.7.4")]
-[assembly: AssemblyFileVersion("1.7.4")]
+[assembly: AssemblyVersion("1.7.5")]
+[assembly: AssemblyFileVersion("1.7.5")]

app/controllers/controller.js

@@ -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]);
             });
         }
     };

app/directives/archetypeproperty.js

@@ -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;
 

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.7.4",
+	"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/",

config/package.nuspec

@@ -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>