Merge branch '1.1.0' of https://github.com/riganti/dotvvm into 1.1.0

riganti · Oct 27, 2017 · b287040 · b287040
2 parents 55f2a3e + 493e9ac
commit b287040
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 51 deletions.
diff --git a/src/DotVVM.Framework/Resources/Scripts/DotVVM.Serialization.ts b/src/DotVVM.Framework/Resources/Scripts/DotVVM.Serialization.ts
@@ -103,7 +103,8 @@ class DotvvmSerialization {
                             result[prop](deserialized());
                         }
                     } else {
-                        result[prop] = ko.observable(ko.unwrap(deserialized));      // don't reuse the same observable from the source
+                        const unwrapped = ko.unwrap(deserialized);
+                        result[prop] = Array.isArray(unwrapped) ? ko.observableArray(unwrapped) : ko.observable(unwrapped);      // don't reuse the same observable from the source
                     }
                 } else {
                     if (ko.isObservable(result[prop])) {

diff --git a/src/DotVVM.Framework/Resources/Scripts/DotVVM.js b/src/DotVVM.Framework/Resources/Scripts/DotVVM.js
diff --git a/src/DotVVM.Framework/Resources/Scripts/DotVVM.js.map b/src/DotVVM.Framework/Resources/Scripts/DotVVM.js.map
diff --git a/src/DotVVM.Framework/Resources/Scripts/DotVVM.ts b/src/DotVVM.Framework/Resources/Scripts/DotVVM.ts
@@ -998,8 +998,8 @@ class DotVVM {
         };
 
         ko.bindingHandlers["dotvvm-CheckState"] = {
-            init(element, valueAccessor, allBindings) {
-                ko.getBindingHandler("checked").init(element, valueAccessor, allBindings);
+            init(element, valueAccessor, allBindings, viewModel, bindingContext) {
+                ko.getBindingHandler("checked").init(element, valueAccessor, allBindings, viewModel, bindingContext);
             },
             update(element, valueAccessor, allBindings) {
                 let value = ko.unwrap(valueAccessor());