Get working happily with angular 1.3

mike-marcacci · mike-marcacci · commit 360dac9999b8 · 2014-07-28T01:35:25.000-07:00
diff --git a/bower.json b/bower.json
@@ -30,10 +30,10 @@
     "coverage"
   ],
   "dependencies": {
-    "angular": "~1.2.18",
+    "angular": "~1.3.0",
     "tv4": "~1.0.15",
     "pickadate": "~3.5.2",
-    "angular-sanitize": "~1.2.18",
+    "angular-sanitize": "~1.3.0",
     "bootstrap-vertical-tabs": "~1.1.0",
     "objectpath": "~1.0.2"
   },
diff --git a/dist/schema-form.min.js b/dist/schema-form.min.js
@@ -141,9 +141,8 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
                 $http.get(url,{ cache: $templateCache }).then(function(res){
                   var key = form.key ? ObjectPathProvider.stringify(form.key).replace(/"/g, '&quot;') : '';
                   var template = res.data.replace(/\$\$value\$\$/g,'model'+key);
-                  $compile(template)(scope,function(clone){
-                    element.replaceWith(clone);
-                  });
+                  element.html(template);
+                  $compile(element.contents())(scope);
                 });
                 once();
               }
diff --git a/examples/bootstrap-example.html b/examples/bootstrap-example.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html ng-app="test">
+<html>
 <head>
   <meta charset="utf-8">
   <title>Bootstrap Schema Form example</title>
@@ -28,14 +28,15 @@
   .schema {  height: 800px;  }
   </style>
 </head>
-<body ng-controller="TestCtrl">
+<body ng-app="test" ng-controller="TestCtrl">
 
 <div class="col-md-12">
   <h1>Schema Form Example</h1>
   <div class="row">
     <div class="col-sm-4">
       <h3>The Generated Form</h3>
-      <form name="ngform" sf-model="modelData" sf-form="form" sf-schema="schema" sf-decorator="{{decorator}}">
+      <form name="ngform" sf-model="modelData" sf-form="form" sf-schema="schema">
+      <div sf-decorator="{{decorator}}"></div>
       </form>
       <h3>Model</h3>
       <pre ng-cloak>{{pretty()}}</pre>
@@ -61,26 +62,27 @@ <h3>Schema</h3>
 <script type="text/javascript" src="http://cdn.jsdelivr.net/g/jquery.ui@1.10"></script>
 <script type="text/javascript" src="../bower_components/tv4/tv4.js"></script>
 <script type="text/javascript" src="../bower_components/ace-builds/src-min-noconflict/ace.js"></script>
+
 <script type="text/javascript" src="../bower_components/angular/angular.js"></script>
-<script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
+<script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
+
 <script type="text/javascript" src="../bower_components/angular-ui-sortable/sortable.js"></script>
 <script type="text/javascript" src="../bower_components/angular-ui-ace/ui-ace.js"></script>
 <script type="text/javascript" src="../bower_components/objectpath/lib/ObjectPath.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/picker.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/picker.date.js"></script>
 <script type="text/javascript" src="../bower_components/pickadate/lib/translations/sv_SE.js"></script>
+
 <script type="text/javascript" src="../dist/schema-form.min.js"></script>
 <script type="text/javascript" src="../dist/bootstrap-decorator.min.js"></script>
-<script type="text/javascript" src="../dist/bootstrap-datepicker.min.js"></script>
+<!-- <script type="text/javascript" src="../dist/bootstrap-datepicker.min.js"></script> -->
 <script type="text/javascript">
 
-angular.module('test',['schemaForm','ui.ace','ObjectPath']);
-
-function TestCtrl($scope,$http){
+angular.module('test',['schemaForm','ui.ace']).controller('TestCtrl', function($scope,$http){
 
   $scope.tests = [
-    { name: "Complex Key Support", data: 'data/keys.json' },
     { name: "Simple", data: 'data/simple.json' },
+    { name: "Complex Key Support", data: 'data/complex-keys.json' },
     { name: "Array", data: 'data/array.json' },
     { name: "Tab Array", data: 'data/tabarray.json' },
     { name: "Kitchen Sink", data: 'data/sink.json' }
@@ -144,7 +146,7 @@ <h3>Schema</h3>
     alert(msg);
   };
 
-}
+});
 
 </script>
 </body>
diff --git a/examples/data/complex-keys.json b/examples/data/complex-keys.json
@@ -4,14 +4,13 @@
     "title": "Complex Key Support",
     "properties": {
       "a[\"b\"].c": {
-        "type": "text",
-        "title": "Paths do not overflow their keys."
+        "type": "text"
       },
       "simple": {
         "type": "object",
         "properties": {
           "prøp": {
-            "title": "Property",
+            "title": "UTF8 in both dot and bracket notation",
             "type": "string"
           }
         }
diff --git a/src/services/decorators.js b/src/services/decorators.js
@@ -53,9 +53,8 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
                 $http.get(url,{ cache: $templateCache }).then(function(res){
                   var key = form.key ? ObjectPathProvider.stringify(form.key).replace(/"/g, '&quot;') : '';
                   var template = res.data.replace(/\$\$value\$\$/g,'model'+key);
-                  $compile(template)(scope,function(clone){
-                    element.replaceWith(clone);
-                  });
+                  element.html(template);
+                  $compile(element.contents())(scope);
                 });
                 once();
               }
