From f532f160bc6b154806bb38b93bbc2760370ee6c4 Mon Sep 17 00:00:00 2001
From: Harold Thetiot <hthetiot@gmail.com>
Date: Wed, 29 Nov 2017 09:42:37 -0800
Subject: [PATCH 1/2] fix 'properties' block is deprecated, use 'values'
 instead

---
 karma.conf.js                                        |  2 ++
 package.json                                         |  6 ++++--
 ui/badge.reel/README.md                              |  2 +-
 ui/badge.reel/badge.meta                             |  4 ++--
 ui/big-list.reel/big-list.html                       |  6 +++---
 ui/big-list.reel/big-list.js                         |  4 ++--
 ui/big-list.reel/big-list.meta                       | 12 ++++++------
 ui/button.reel/README.md                             |  8 ++++----
 ui/button.reel/button.js                             |  2 +-
 ui/button.reel/button.meta                           |  4 ++--
 ui/checkbox.reel/README.md                           |  2 +-
 ui/checkbox.reel/checkbox.html                       |  2 +-
 ui/checkbox.reel/checkbox.js                         |  2 +-
 ui/checkbox.reel/checkbox.meta                       |  4 ++--
 ui/image.reel/image.html                             |  2 +-
 ui/image.reel/image.meta                             |  4 ++--
 ui/list-item.reel/list-item.html                     |  2 +-
 ui/list-item.reel/list-item.meta                     |  4 ++--
 ui/list.reel/README.md                               |  2 +-
 ui/list.reel/list.html                               |  6 +++---
 ui/list.reel/list.meta                               | 12 ++++++------
 ui/number-field.reel/README.md                       |  2 +-
 ui/number-field.reel/number-field.html               |  8 ++++----
 ui/number-field.reel/number-field.js                 |  2 +-
 ui/number-field.reel/number-field.meta               |  4 ++--
 ui/radio-button.reel/README.md                       |  2 +-
 ui/radio-button.reel/radio-button.html               |  2 +-
 ui/radio-button.reel/radio-button.js                 |  2 +-
 ui/radio-button.reel/radio-button.meta               |  4 ++--
 ui/scroller.reel/scroll-bars.reel/scroll-bars.html   |  2 +-
 ui/scroller.reel/scroller.html                       |  6 +++---
 ui/select.reel/README.md                             |  2 +-
 ui/select.reel/select.js                             |  2 +-
 ui/select.reel/select.meta                           |  4 ++--
 ui/slider.reel/README.md                             |  2 +-
 ui/slider.reel/slider.html                           |  2 +-
 ui/slider.reel/slider.meta                           |  4 ++--
 ui/text-area.reel/README.md                          |  2 +-
 ui/text-area.reel/text-area.html                     |  2 +-
 ui/text-area.reel/text-area.js                       |  2 +-
 ui/text-area.reel/text-area.meta                     |  4 ++--
 ui/text-field.reel/README.md                         |  2 +-
 ui/text-field.reel/text-field.html                   |  2 +-
 ui/text-field.reel/text-field.js                     |  2 +-
 ui/text-field.reel/text-field.meta                   |  4 ++--
 ui/text.reel/README.md                               |  2 +-
 ui/text.reel/text.js                                 |  2 +-
 ui/text.reel/text.meta                               |  4 ++--
 ui/title.reel/README.md                              |  2 +-
 ui/title.reel/title.meta                             |  4 ++--
 ui/toggle-switch.reel/README.md                      |  2 +-
 ui/toggle-switch.reel/toggle-switch.html             |  2 +-
 .../video-control-track.html                         |  6 +++---
 ui/video-control.reel/video-control.html             | 10 +++++-----
 ui/video.reel/README.md                              | 10 +++++-----
 ui/video.reel/video.html                             |  6 +++---
 56 files changed, 108 insertions(+), 104 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 8e101e5..5643816 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,3 +1,5 @@
+/* global module */
+
 // Karma configuration
 // Generated on Tue Mar 07 2017 13:59:10 GMT-0800 (PST)
 
diff --git a/package.json b/package.json
index 75c665b..6febe51 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,21 @@
 {
   "name": "digit",
   "description": "Touch-optimized MontageJS components for tablets and phones.",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "https://github.com/montagejs/digit.git"
   },
   "dependencies": {
-    "montage": "^17.0.7"
+    "montage": "^17.0.11"
   },
   "devDependencies": {
     "concurrently": "^3.4.0",
     "http-server": "^0.9.0",
     "jasmine-console-reporter": "^1.2.7",
     "jasmine-core": "^2.5.2",
+    "jshint": "^2.9.5",
     "karma": "^1.5.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
@@ -25,6 +26,7 @@
     "open": "0.0.5"
   },
   "scripts": {
+    "lint": "jshint .",
     "test": "node test/run-node.js",
     "test:karma": "karma start --no-auto-watch --single-run",
     "test:karma-dev": "karma start --auto-watch --no-single-run",
diff --git a/ui/badge.reel/README.md b/ui/badge.reel/README.md
index 9fc739c..f381077 100644
--- a/ui/badge.reel/README.md
+++ b/ui/badge.reel/README.md
@@ -9,7 +9,7 @@ The Badge can be used as a notification counter or highlighting.
 ```json
 "badge": {
     "prototype": "digit/ui/badge.reel",
-    "properties": {
+    "values": {
         "element": {"#": "badge"}
     }
 }
diff --git a/ui/badge.reel/badge.meta b/ui/badge.reel/badge.meta
index bca38ce..7db51d1 100644
--- a/ui/badge.reel/badge.meta
+++ b/ui/badge.reel/badge.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Text",
                 "prototypeName": "Text",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Badge",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/big-list.reel/big-list.html b/ui/big-list.reel/big-list.html
index 47a0621..bb75f46 100644
--- a/ui/big-list.reel/big-list.html
+++ b/ui/big-list.reel/big-list.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "digitList"},
                 "flow": {"@": "flow"},
                 "_scrollBars": {"@": "scrollbars"}
@@ -17,13 +17,13 @@
         },
         "scrollbars": {
             "prototype": "ui/scroller.reel/scroll-bars.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "scrollbars"}
             }
         },
         "flow": {
             "prototype": "montage/ui/flow.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "flow"},
                 "paths": [{
                     "knots": [
diff --git a/ui/big-list.reel/big-list.js b/ui/big-list.reel/big-list.js
index 5bd8829..fea7fb8 100644
--- a/ui/big-list.reel/big-list.js
+++ b/ui/big-list.reel/big-list.js
@@ -35,7 +35,7 @@ exports.BigList = Component.specialize( /** @lends BigList# */ {
                 this._rowHeight = this._measureRowHeight();
                 this.flow.linearScrollingVector = this._calculateLinearScrollingVector(this._height, this._rowHeight);
                 this.flow.paths = this._calculateFlowPath(this._height, this._rowHeight);
-                this.flow.cameraTargetPoint = this._calculateCameraTargetPoint(this._width, this._height, this._rowHeight)
+                this.flow.cameraTargetPoint = this._calculateCameraTargetPoint(this._width, this._height, this._rowHeight);
                 this.flow.cameraPosition = this._calculateCameraPosition(this._width, this._height, this._rowHeight);
                 this.flow.cameraFov = 90;
                 this._scrollBars.displayHorizontal = false;
@@ -71,7 +71,7 @@ exports.BigList = Component.specialize( /** @lends BigList# */ {
 
     _calculateLinearScrollingVector: {
         value: function(height, rowHeight) {
-            return [0, (-500 * rowHeight) / height, 0]
+            return [0, (-500 * rowHeight) / height, 0];
         }
     },
 
diff --git a/ui/big-list.reel/big-list.meta b/ui/big-list.reel/big-list.meta
index c05d8fd..bf7ee34 100644
--- a/ui/big-list.reel/big-list.meta
+++ b/ui/big-list.reel/big-list.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_component_reference": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Component",
                 "prototypeName": "Component",
@@ -13,7 +13,7 @@
     },
     "blueprint_list_delegate": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "delegate",
             "blueprint": {
                 "@": "root"
@@ -23,7 +23,7 @@
     },
     "blueprint_list_content": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "content",
             "blueprint": {
                 "@": "root"
@@ -34,7 +34,7 @@
     },
     "blueprint_list_contentController": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "contentController",
             "blueprint": {
                 "@": "root"
@@ -44,7 +44,7 @@
     },
     "blueprint_list_isSelectionEnabled": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "isSelectionEnabled",
             "blueprint": {
                 "@": "root"
@@ -54,7 +54,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "BigList",
             "parent": {
                 "@": "blueprint_component_reference"
diff --git a/ui/button.reel/README.md b/ui/button.reel/README.md
index 83b5132..d019965 100644
--- a/ui/button.reel/README.md
+++ b/ui/button.reel/README.md
@@ -9,7 +9,7 @@ The Button component wraps a `<button>`, `<input type="button">` or `<a>` elemen
 ```json
 "button": {
     "prototype": "digit/ui/button.reel",
-    "properties": {
+    "values": {
         "element": {"#": "button"}
     }
 }
@@ -56,19 +56,19 @@ The ButtonGroup component wraps multiple `Button`s and groups them together.
 ```json
 "button-1": {
     "prototype": "digit/ui/button.reel",
-    "properties": {
+    "values": {
         "element": {"#": "button-1"}
     }
 }
 "button-2": {
     "prototype": "digit/ui/button.reel",
-    "properties": {
+    "values": {
         "element": {"#": "button-2"}
     }
 }
 "button-3": {
     "prototype": "digit/ui/button.reel",
-    "properties": {
+    "values": {
         "element": {"#": "button-3"}
     }
 }
diff --git a/ui/button.reel/button.js b/ui/button.reel/button.js
index 446b249..51e95d4 100644
--- a/ui/button.reel/button.js
+++ b/ui/button.reel/button.js
@@ -12,7 +12,7 @@ var AbstractButton = require("montage/ui/base/abstract-button").AbstractButton;
  * ```json
  * "button": {
  *     "prototype": "digit/ui/button.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "button"}
  *     }
  * }
diff --git a/ui/button.reel/button.meta b/ui/button.reel/button.meta
index cb560ee..63c7d8b 100644
--- a/ui/button.reel/button.meta
+++ b/ui/button.reel/button.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractButton",
                 "prototypeName": "AbstractButton",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Button",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/checkbox.reel/README.md b/ui/checkbox.reel/README.md
index 8d974ca..956cfd9 100644
--- a/ui/checkbox.reel/README.md
+++ b/ui/checkbox.reel/README.md
@@ -7,7 +7,7 @@
 ```json
 "checkbox": {
     "prototype": "digit/ui/checkbox.reel",
-    "properties": {
+    "values": {
         "element": {"#": "checkbox"}
     }
 }
diff --git a/ui/checkbox.reel/checkbox.html b/ui/checkbox.reel/checkbox.html
index 337595d..beef5d8 100644
--- a/ui/checkbox.reel/checkbox.html
+++ b/ui/checkbox.reel/checkbox.html
@@ -7,7 +7,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "checkbox"}
             }
         }
diff --git a/ui/checkbox.reel/checkbox.js b/ui/checkbox.reel/checkbox.js
index 6dfb005..4a0a6a2 100644
--- a/ui/checkbox.reel/checkbox.js
+++ b/ui/checkbox.reel/checkbox.js
@@ -10,7 +10,7 @@ var AbstractCheckbox = require("montage/ui/base/abstract-checkbox").AbstractChec
  * ```json
  * "checkbox": {
  *     "prototype": "digit/ui/checkbox.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "checkbox"}
  *     }
  * }
diff --git a/ui/checkbox.reel/checkbox.meta b/ui/checkbox.reel/checkbox.meta
index e7b388e..e4afccc 100644
--- a/ui/checkbox.reel/checkbox.meta
+++ b/ui/checkbox.reel/checkbox.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractCheckbox",
                 "prototypeName": "AbstractCheckbox",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Checkbox",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/image.reel/image.html b/ui/image.reel/image.html
index 8f3cc14..4237476 100644
--- a/ui/image.reel/image.html
+++ b/ui/image.reel/image.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "image"}
             }
         }
diff --git a/ui/image.reel/image.meta b/ui/image.reel/image.meta
index 01b999a..ede80e4 100644
--- a/ui/image.reel/image.meta
+++ b/ui/image.reel/image.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractImage",
                 "prototypeName": "AbstractImage",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Image",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/list-item.reel/list-item.html b/ui/list-item.reel/list-item.html
index 01794cb..f2d4feb 100644
--- a/ui/list-item.reel/list-item.html
+++ b/ui/list-item.reel/list-item.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "list-item"}
             }
         }
diff --git a/ui/list-item.reel/list-item.meta b/ui/list-item.reel/list-item.meta
index 1398bbe..50ef589 100644
--- a/ui/list-item.reel/list-item.meta
+++ b/ui/list-item.reel/list-item.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Component",
                 "prototypeName": "Component",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "ListItem",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/list.reel/README.md b/ui/list.reel/README.md
index 8791b18..4b77ae3 100644
--- a/ui/list.reel/README.md
+++ b/ui/list.reel/README.md
@@ -9,7 +9,7 @@ The List component wraps an `<ul>` element. It supports different kind of list i
 ```json
 "list": {
     "prototype": "digit/ui/list.reel",
-    "properties": {
+    "values": {
         "element": {"#": "list"}
     }
 }
diff --git a/ui/list.reel/list.html b/ui/list.reel/list.html
index 6c1654c..5326f62 100644
--- a/ui/list.reel/list.html
+++ b/ui/list.reel/list.html
@@ -6,14 +6,14 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "properties": {
+                "values": {
                     "element": {"#": "list"}
                 }
             },
 
             "repetition": {
                 "prototype": "montage/ui/repetition.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "repetition"}
                 },
                 "bindings": {
@@ -23,7 +23,7 @@
 
             "scroller": {
                 "prototype": "ui/scroller.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "scroller"}
                 },
                 "bindings": {
diff --git a/ui/list.reel/list.meta b/ui/list.reel/list.meta
index 2113a54..73a1bd4 100644
--- a/ui/list.reel/list.meta
+++ b/ui/list.reel/list.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_component_reference": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Component",
                 "prototypeName": "Component",
@@ -13,7 +13,7 @@
     },
     "blueprint_list_delegate": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "delegate",
             "blueprint": {
                 "@": "root"
@@ -23,7 +23,7 @@
     },
     "blueprint_list_content": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "content",
             "blueprint": {
                 "@": "root"
@@ -34,7 +34,7 @@
     },
     "blueprint_list_contentController": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "contentController",
             "blueprint": {
                 "@": "root"
@@ -44,7 +44,7 @@
     },
     "blueprint_list_isSelectionEnabled": {
         "prototype": "montage/core/meta/property-blueprint",
-        "properties": {
+        "values": {
             "name": "isSelectionEnabled",
             "blueprint": {
                 "@": "root"
@@ -54,7 +54,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "List",
             "parent": {
                 "@": "blueprint_component_reference"
diff --git a/ui/number-field.reel/README.md b/ui/number-field.reel/README.md
index 70bc22f..d7e9d6f 100644
--- a/ui/number-field.reel/README.md
+++ b/ui/number-field.reel/README.md
@@ -9,7 +9,7 @@ The Number Field component wraps an HTML `<input type="number">` element and add
 ```json
 "number": {
     "prototype": "digit/ui/number-field.reel",
-    "properties": {
+    "values": {
         "element": {"#": "number"},
         "value": 0
     }
diff --git a/ui/number-field.reel/number-field.html b/ui/number-field.reel/number-field.html
index 55961b5..36b92af 100644
--- a/ui/number-field.reel/number-field.html
+++ b/ui/number-field.reel/number-field.html
@@ -7,7 +7,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "numberField"},
                 "_numberFieldTextFieldComponent": {"@": "textField"},
                 "_numberFieldMinusComponent": {"@": "minus"},
@@ -18,7 +18,7 @@
 
         "textField": {
             "prototype": "ui/text-field.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "textField"}
             },
             "bindings" : {
@@ -28,14 +28,14 @@
 
         "plus": {
             "prototype": "ui/button.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "buttonPlus"}
             }
         },
 
         "minus": {
             "prototype": "ui/button.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "buttonMinus"}
             }
         }
diff --git a/ui/number-field.reel/number-field.js b/ui/number-field.reel/number-field.js
index 6a0c520..2ffe73d 100644
--- a/ui/number-field.reel/number-field.js
+++ b/ui/number-field.reel/number-field.js
@@ -12,7 +12,7 @@ var AbstractNumberField = require("montage/ui/base/abstract-number-field").Abstr
  * ```json
  * "number": {
  *     "prototype": "digit/ui/number-field.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "number"},
  *         "value": 0
  *     }
diff --git a/ui/number-field.reel/number-field.meta b/ui/number-field.reel/number-field.meta
index d813eb2..d36897a 100644
--- a/ui/number-field.reel/number-field.meta
+++ b/ui/number-field.reel/number-field.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractNumberField",
                 "prototypeName": "AbstractNumberField",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "NumberField",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/radio-button.reel/README.md b/ui/radio-button.reel/README.md
index a0e8f33..9957bdf 100644
--- a/ui/radio-button.reel/README.md
+++ b/ui/radio-button.reel/README.md
@@ -7,7 +7,7 @@
 ```json
 "radio": {
     "prototype": "digit/ui/radio-button.reel",
-    "properties": {
+    "values": {
         "element": {"#": "radio"},
         "value": 1
     }
diff --git a/ui/radio-button.reel/radio-button.html b/ui/radio-button.reel/radio-button.html
index d28b0a8..821e2ac 100644
--- a/ui/radio-button.reel/radio-button.html
+++ b/ui/radio-button.reel/radio-button.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "properties": {
+                "values": {
                     "element": {"#": "radioButton"}
                 }
             }
diff --git a/ui/radio-button.reel/radio-button.js b/ui/radio-button.reel/radio-button.js
index 3a1cd2c..5cb3e64 100644
--- a/ui/radio-button.reel/radio-button.js
+++ b/ui/radio-button.reel/radio-button.js
@@ -12,7 +12,7 @@ CLASS_PREFIX = "digit-RadioButton";
  * ```json
  * "radio": {
  *     "prototype": "digit/ui/radio-button.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "radio"},
  *         "value": 1
  *     }
diff --git a/ui/radio-button.reel/radio-button.meta b/ui/radio-button.reel/radio-button.meta
index 52abafd..23e1917 100644
--- a/ui/radio-button.reel/radio-button.meta
+++ b/ui/radio-button.reel/radio-button.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractRadioButton",
                 "prototypeName": "AbstractRadioButton",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "RadioButton",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/scroller.reel/scroll-bars.reel/scroll-bars.html b/ui/scroller.reel/scroll-bars.reel/scroll-bars.html
index f252771..ea2c34a 100644
--- a/ui/scroller.reel/scroll-bars.reel/scroll-bars.html
+++ b/ui/scroller.reel/scroll-bars.reel/scroll-bars.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
 {
     "owner": {
-        "properties": {
+        "values": {
             "element": {
                 "#": "digit-scroll-bars"
             },
diff --git a/ui/scroller.reel/scroller.html b/ui/scroller.reel/scroller.html
index c33f95a..d4d902e 100644
--- a/ui/scroller.reel/scroller.html
+++ b/ui/scroller.reel/scroller.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
 {
     "owner": {
-        "properties": {
+        "values": {
             "_content": {
                 "#": "content"
             },
@@ -20,7 +20,7 @@
     },
     "scrollbars": {
         "prototype": "./scroll-bars.reel",
-        "properties": {
+        "values": {
             "element": {
                 "#": "scrollbars"
             }
@@ -28,7 +28,7 @@
     },
     "translateComposer1": {
         "prototype": "montage/composer/translate-composer",
-        "properties": {
+        "values": {
             "component": {"@": "owner"},
             "minTranslateX": 0,
             "minTranslateY": 0,
diff --git a/ui/select.reel/README.md b/ui/select.reel/README.md
index 20d5c57..fa0c808 100644
--- a/ui/select.reel/README.md
+++ b/ui/select.reel/README.md
@@ -9,7 +9,7 @@ The Select Input component wraps an HTML `<select>` element.
 ```json
 "select": {
     "prototype": "digit/ui/select.reel",
-    "properties": {
+    "values": {
         "element": {"#": "select"},
         "content": [
             {"label": "California", "code": "CA"},
diff --git a/ui/select.reel/select.js b/ui/select.reel/select.js
index 30a8df7..afc8316 100644
--- a/ui/select.reel/select.js
+++ b/ui/select.reel/select.js
@@ -12,7 +12,7 @@ var AbstractSelect = require("montage/ui/base/abstract-select").AbstractSelect;
  * ```json
  * "select": {
  *     "prototype": "digit/ui/select.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "select"},
  *         "content": [
  *             {"label": "California", "code": "CA"},
diff --git a/ui/select.reel/select.meta b/ui/select.reel/select.meta
index dcfdcf2..a694388 100644
--- a/ui/select.reel/select.meta
+++ b/ui/select.reel/select.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractSelect",
                 "prototypeName": "AbstractSelect",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Select",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/slider.reel/README.md b/ui/slider.reel/README.md
index 0be5650..6f16dfa 100644
--- a/ui/slider.reel/README.md
+++ b/ui/slider.reel/README.md
@@ -9,7 +9,7 @@ The Slider component wraps an HTML `<input type="range">` element.
 ```json
 "slider": {
     "prototype": "digit/ui/slider.reel",
-    "properties": {
+    "values": {
         "element": {"#": "slider"}
     }
 }
diff --git a/ui/slider.reel/slider.html b/ui/slider.reel/slider.html
index af7f943..7635fb2 100644
--- a/ui/slider.reel/slider.html
+++ b/ui/slider.reel/slider.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "properties": {
+                "values": {
                     "element": {"#": "slider"},
                     "_sliderThumbElement": {"#": "sliderThumb"}
                 }
diff --git a/ui/slider.reel/slider.meta b/ui/slider.reel/slider.meta
index c7d1c3b..329f54a 100644
--- a/ui/slider.reel/slider.meta
+++ b/ui/slider.reel/slider.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractSlider",
                 "prototypeName": "AbstractSlider",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Slider",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/text-area.reel/README.md b/ui/text-area.reel/README.md
index de06924..7bb1633 100644
--- a/ui/text-area.reel/README.md
+++ b/ui/text-area.reel/README.md
@@ -7,7 +7,7 @@
 ```json
 "textArea": {
     "prototype": "digit/ui/text-area.reel",
-    "properties": {
+    "values": {
         "element": {"#": "textArea"}
     }
 }
diff --git a/ui/text-area.reel/text-area.html b/ui/text-area.reel/text-area.html
index b685888..37a47b4 100644
--- a/ui/text-area.reel/text-area.html
+++ b/ui/text-area.reel/text-area.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "textArea"}
             }
         }
diff --git a/ui/text-area.reel/text-area.js b/ui/text-area.reel/text-area.js
index 60f8f9e..bc30609 100644
--- a/ui/text-area.reel/text-area.js
+++ b/ui/text-area.reel/text-area.js
@@ -10,7 +10,7 @@ var AbstractTextArea = require("montage/ui/base/abstract-text-area").AbstractTex
  * ```json
  * "textArea": {
  *     "prototype": "digit/ui/text-area.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "textArea"}
  *     }
  * }
diff --git a/ui/text-area.reel/text-area.meta b/ui/text-area.reel/text-area.meta
index c79e1d6..72535bd 100644
--- a/ui/text-area.reel/text-area.meta
+++ b/ui/text-area.reel/text-area.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractTextArea",
                 "prototypeName": "AbstractTextArea",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "TextArea",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/text-field.reel/README.md b/ui/text-field.reel/README.md
index 2130aa7..bb332f5 100644
--- a/ui/text-field.reel/README.md
+++ b/ui/text-field.reel/README.md
@@ -9,7 +9,7 @@ The TextField component wraps an HTML `<input type="text">` element.
 ```json
 "textField": {
     "prototype": "digit/ui/text-field.reel",
-    "properties": {
+    "values": {
         "element": {"#": "textField"}
     }
 }
diff --git a/ui/text-field.reel/text-field.html b/ui/text-field.reel/text-field.html
index 1085161..282e923 100644
--- a/ui/text-field.reel/text-field.html
+++ b/ui/text-field.reel/text-field.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "textField"}
             }
         }
diff --git a/ui/text-field.reel/text-field.js b/ui/text-field.reel/text-field.js
index 463a00b..2bf57db 100644
--- a/ui/text-field.reel/text-field.js
+++ b/ui/text-field.reel/text-field.js
@@ -12,7 +12,7 @@ var AbstractTextField = require("montage/ui/base/abstract-text-field").AbstractT
  * ```json
  * "textField": {
  *     "prototype": "digit/ui/text-field.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "textField"}
  *     }
  * }
diff --git a/ui/text-field.reel/text-field.meta b/ui/text-field.reel/text-field.meta
index adf1343..7666bc9 100644
--- a/ui/text-field.reel/text-field.meta
+++ b/ui/text-field.reel/text-field.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "AbstractTextField",
                 "prototypeName": "AbstractTextField",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "TextField",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/text.reel/README.md b/ui/text.reel/README.md
index e41733c..77dfb4c 100644
--- a/ui/text.reel/README.md
+++ b/ui/text.reel/README.md
@@ -9,7 +9,7 @@ The Text component can be used for any kind of dynamic text.
 ```json
 "text": {
     "prototype": "digit/ui/text.reel",
-    "properties": {
+    "values": {
         "element": {"#": "text"}
     }
 }
diff --git a/ui/text.reel/text.js b/ui/text.reel/text.js
index 7f7e2d5..d4b406e 100644
--- a/ui/text.reel/text.js
+++ b/ui/text.reel/text.js
@@ -13,7 +13,7 @@ var Text = require("montage/ui/text.reel").Text;
  * ```json
  * "text": {
  *     "prototype": "digit/ui/text.reel",
- *     "properties": {
+ *     "values": {
  *         "element": {"#": "text"}
  *     }
  * }
diff --git a/ui/text.reel/text.meta b/ui/text.reel/text.meta
index 21c6712..6a340c4 100644
--- a/ui/text.reel/text.meta
+++ b/ui/text.reel/text.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Text",
                 "prototypeName": "Text",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Text",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/title.reel/README.md b/ui/title.reel/README.md
index 0fbd99f..2ff647b 100644
--- a/ui/title.reel/README.md
+++ b/ui/title.reel/README.md
@@ -9,7 +9,7 @@ The Title component is a block element with a bold weight.
 ```json
 "title": {
     "prototype": "digit/ui/title.reel",
-    "properties": {
+    "values": {
         "element": {"#": "title"}
     }
 }
diff --git a/ui/title.reel/title.meta b/ui/title.reel/title.meta
index 8d58d92..e7102f6 100644
--- a/ui/title.reel/title.meta
+++ b/ui/title.reel/title.meta
@@ -1,7 +1,7 @@
 {
     "blueprint_parent": {
         "prototype": "montage/core/meta/blueprint-reference",
-        "properties": {
+        "values": {
             "valueReference": {
                 "blueprintName": "Text",
                 "prototypeName": "Text",
@@ -13,7 +13,7 @@
     },
     "root": {
         "prototype": "montage/core/meta/module-blueprint",
-        "properties": {
+        "values": {
             "name": "Title",
             "parent": {
                 "@": "blueprint_parent"
diff --git a/ui/toggle-switch.reel/README.md b/ui/toggle-switch.reel/README.md
index 95cf9b9..2c22ed8 100644
--- a/ui/toggle-switch.reel/README.md
+++ b/ui/toggle-switch.reel/README.md
@@ -13,7 +13,7 @@ The Toggle Switch component turns an `<input type="checkbox">` element into a to
 ```json
 "toggle-switch": {
     "prototype": "ui/toggle-switch.reel",
-    "properties": {
+    "values": {
         "element": {"#": "toggle-switch"}
     }
 }
diff --git a/ui/toggle-switch.reel/toggle-switch.html b/ui/toggle-switch.reel/toggle-switch.html
index 83f0d1f..df3adeb 100644
--- a/ui/toggle-switch.reel/toggle-switch.html
+++ b/ui/toggle-switch.reel/toggle-switch.html
@@ -7,7 +7,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "properties": {
+                "values": {
                     "element": {"#": "toggleSwitch"}
                 }
         
diff --git a/ui/video-control.reel/video-control-track.reel/video-control-track.html b/ui/video-control.reel/video-control-track.reel/video-control-track.html
index dbd1305..00d1ed3 100644
--- a/ui/video-control.reel/video-control-track.reel/video-control-track.html
+++ b/ui/video-control.reel/video-control-track.reel/video-control-track.html
@@ -6,14 +6,14 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "video-control-track"}
             }
         },
 
         "slider": {
             "prototype": "ui/video-control.reel/video-control-track.reel[Slider]",
-            "properties": {
+            "values": {
                 "element": {"#": "slider"},
                 "_sliderThumbElement": {"#": "sliderThumb"}
             },
@@ -24,7 +24,7 @@
 
         "progressBar": {
             "prototype": "ui/video-control.reel/video-control-track.reel[ProgressBar]",
-            "properties": {
+            "values": {
                 "element": {"#": "progress-bar"},
                 "_progressBarValueElement": {"#": "progress-bar-value"}
             },
diff --git a/ui/video-control.reel/video-control.html b/ui/video-control.reel/video-control.html
index 6c64f61..b554980 100644
--- a/ui/video-control.reel/video-control.html
+++ b/ui/video-control.reel/video-control.html
@@ -6,7 +6,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "properties": {
+            "values": {
                 "element": {"#": "video-control"},
                 "_controlTrack": {"@": "track"}
             }
@@ -14,7 +14,7 @@
 
         "play": {
             "prototype": "ui/video-control.reel[Button]",
-            "properties": {
+            "values": {
                 "element": {"#": "play"}
             },
             "listeners": [
@@ -27,7 +27,7 @@
 
         "track": {
             "prototype": "ui/video-control.reel/video-control-track.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "track"}
             },
             "bindings": {
@@ -37,7 +37,7 @@
 
         "time": {
             "prototype": "montage/ui/text.reel",
-            "properties": {
+            "values": {
                 "element": {"#": "time"}
             },
             "bindings": {
@@ -47,7 +47,7 @@
 
         "fullScreen": {
             "prototype": "ui/video-control.reel[Button]",
-            "properties": {
+            "values": {
                 "element": {"#": "fullScreen"}
             },
             "listeners": [
diff --git a/ui/video.reel/README.md b/ui/video.reel/README.md
index f6a124d..ec63522 100644
--- a/ui/video.reel/README.md
+++ b/ui/video.reel/README.md
@@ -15,7 +15,7 @@ The Video component wraps a video element and provides custom controls.
 ```json
 "video": {
     "prototype": "ui/video.reel",
-    "properties": {
+    "values": {
         "element": {"#": "video"},
         "src": "movie.ogg",
         "posterSrc": "poster.png"
@@ -39,7 +39,7 @@ Multiple source files can be specified with the `sources` property. The Video co
 ```json
 "video": {
     "prototype": "ui/video.reel",
-    "properties": {
+    "values": {
         "element": {"#": "video"},
         "sources": [
             {"src": "movie.ogg", "type": "video/ogg"},
@@ -62,7 +62,7 @@ Playback of multiple videos can be synchronized by using the same MediaControlle
 ```json
 "video1": {
     "prototype": "ui/video.reel",
-    "properties": {
+    "values": {
         "element": {"#": "video1"},
         "videoController" : {"@": "mediaController"},
         "src": "movie1.mp4"
@@ -70,7 +70,7 @@ Playback of multiple videos can be synchronized by using the same MediaControlle
 },
 "video2": {
     "prototype": "ui/video.reel",
-    "properties": {
+    "values": {
         "element": {"#": "video2"},
         "videoController" : {"@": "mediaController"},
         "src": "movie2.mp4"
@@ -78,7 +78,7 @@ Playback of multiple videos can be synchronized by using the same MediaControlle
 },
 "mediaController": {
     "prototype": "montage/core/media-controller",
-    "properties": {
+    "values": {
         "autoplay": false
     }
 }
diff --git a/ui/video.reel/video.html b/ui/video.reel/video.html
index bdf9474..e193f8c 100644
--- a/ui/video.reel/video.html
+++ b/ui/video.reel/video.html
@@ -8,14 +8,14 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "properties": {
+                "values": {
                     "element": {"#": "video"},
                     "mediaElement": {"#": "mediaElement"}
                 }
             },
             "control": {
                 "prototype": "ui/video-control.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "control"},
                     "video": {"@": "owner"}
                 },
@@ -25,7 +25,7 @@
             },
             "play": {
                 "prototype": "ui/button.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "play"}
                 },
                 "listeners": [

From 9d21e782b6df48a54b71cb350b0ef18ccde12ff5 Mon Sep 17 00:00:00 2001
From: Harold Thetiot <hthetiot@gmail.com>
Date: Wed, 29 Nov 2017 09:55:50 -0800
Subject: [PATCH 2/2] fix 'properties' block is deprecated, use 'values'
 instead

---
 test/spec/button/button-test.html                      |  4 ++--
 test/spec/checkbox/checkbox-test.html                  |  6 +++---
 test/spec/list/list-test.html                          |  6 +++---
 test/spec/number-field/number-field-test.html          |  6 +++---
 test/spec/radio-button/radio-button-test.html          |  2 +-
 test/spec/select/select-test.html                      | 10 +++++-----
 test/spec/slider/slider-test.html                      |  8 ++++----
 test/spec/text-area/text-area-test.html                |  4 ++--
 test/spec/text-field/text-field-test.html              |  6 +++---
 test/spec/toggle-switch/toggle-switch-test.html        |  4 ++--
 test/spec/video/video-test.html                        |  4 ++--
 ui/big-list.reel/big-list.html                         |  8 ++------
 ui/list.reel/list.html                                 |  8 ++------
 ui/number-field.reel/number-field.html                 |  4 +---
 ui/scroller.reel/scroller.html                         |  4 +---
 .../video-control-track.reel/video-control-track.html  |  8 ++------
 ui/video-control.reel/video-control.html               |  8 ++------
 ui/video.reel/video.html                               |  4 +---
 18 files changed, 41 insertions(+), 63 deletions(-)

diff --git a/test/spec/button/button-test.html b/test/spec/button/button-test.html
index b78172f..eed0a07 100644
--- a/test/spec/button/button-test.html
+++ b/test/spec/button/button-test.html
@@ -8,14 +8,14 @@
         {
             "test": {
                 "prototype": "spec/button/button-test[Test]",
-                "properties": {
+                "values": {
                     "button": {"@": "button"}
                 }
             },
 
             "button": {
                 "prototype": "digit/ui/button.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "button"}
                 }
             }
diff --git a/test/spec/checkbox/checkbox-test.html b/test/spec/checkbox/checkbox-test.html
index 338c295..cd5487a 100644
--- a/test/spec/checkbox/checkbox-test.html
+++ b/test/spec/checkbox/checkbox-test.html
@@ -8,7 +8,7 @@
         {
             "test": {
                 "prototype": "spec/checkbox/checkbox-test[Test]",
-                "properties": {
+                "values": {
                     "checkbox": {"@": "checkbox"},
                     "checkboxAttributeChecked": {"@": "checkboxChecked"}
                 }
@@ -16,14 +16,14 @@
 
             "checkbox": {
                 "prototype": "digit/ui/checkbox.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "checkbox"}
                 }
             },
             
             "checkboxChecked": {
                 "prototype": "digit/ui/checkbox.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "checkboxChecked"}
                 }
             }
diff --git a/test/spec/list/list-test.html b/test/spec/list/list-test.html
index 3dfc582..4eb1635 100644
--- a/test/spec/list/list-test.html
+++ b/test/spec/list/list-test.html
@@ -7,14 +7,14 @@
         {
             "test": {
                 "prototype": "spec/list/list-test",
-                "properties": {
+                "values": {
                     "list1": {"@": "list1"}
                 }
             },
 
             "list1": {
                 "prototype": "digit/ui/list.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "list1"},
                     "content": [0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2]
                 }
@@ -22,7 +22,7 @@
 
             "listItem1": {
                 "prototype": "digit/ui/list-item.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "listItem1"}
                 }
             }
diff --git a/test/spec/number-field/number-field-test.html b/test/spec/number-field/number-field-test.html
index 70612af..8c97f62 100644
--- a/test/spec/number-field/number-field-test.html
+++ b/test/spec/number-field/number-field-test.html
@@ -8,7 +8,7 @@
         {
             "test": {
                 "prototype": "spec/number-field/number-field-test[Test]",
-                "properties": {
+                "values": {
                     "numberField": {"@": "numberField"},
                     "numberFieldWithAttributes": {"@": "attributes"}
                 }
@@ -16,14 +16,14 @@
 
             "numberField": {
                 "prototype": "digit/ui/number-field.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "numberField"}
                 }
             },
 
             "attributes": {
                 "prototype": "digit/ui/number-field.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "attributes"}
                 }
             }
diff --git a/test/spec/radio-button/radio-button-test.html b/test/spec/radio-button/radio-button-test.html
index 2c7a391..73a33e6 100644
--- a/test/spec/radio-button/radio-button-test.html
+++ b/test/spec/radio-button/radio-button-test.html
@@ -12,7 +12,7 @@
 
             "radioButton1": {
                 "prototype": "digit/ui/radio-button.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "radioButton1"}
                 }
             }
diff --git a/test/spec/select/select-test.html b/test/spec/select/select-test.html
index 9c1cf56..9fffe3b 100644
--- a/test/spec/select/select-test.html
+++ b/test/spec/select/select-test.html
@@ -8,7 +8,7 @@
         {
             "test": {
                 "prototype": "spec/select/select-test[Test]",
-                "properties": {
+                "values": {
                     "select": {"@": "select"},
                     "selectWithContent": {"@": "selectWithContent"},
                     "selectWithOptions": {"@": "selectWithOptions"},
@@ -18,14 +18,14 @@
 
             "select": {
                 "prototype": "digit/ui/select.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "select"}
                 }
             },
 
             "selectWithContent": {
                 "prototype": "digit/ui/select.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "selectWithContent"},
                     "content": [
                         {"label": "Arizona"},
@@ -39,14 +39,14 @@
 
             "selectWithOptions": {
                 "prototype": "digit/ui/select.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "selectWithOptions"}
                 }
             },
 
             "selectWithAttributes": {
                 "prototype": "digit/ui/select.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "selectWithAttributes"}
                 }
             }
diff --git a/test/spec/slider/slider-test.html b/test/spec/slider/slider-test.html
index 20d54ce..d5762f5 100644
--- a/test/spec/slider/slider-test.html
+++ b/test/spec/slider/slider-test.html
@@ -8,21 +8,21 @@
         {
             "test": {
                 "prototype": "spec/slider/slider-test[Test]",
-                "properties": {
+                "values": {
                     "inputRange": {"@": "slider"}
                 }
             },
 
             "slider": {
                 "prototype": "digit/ui/slider.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "slider"}
                 }
             },
 
             "verticalSlider": {
                 "prototype": "digit/ui/slider.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "verticalSlider"},
                     "axis": "vertical"
                 }
@@ -30,7 +30,7 @@
 
             "verticalSlider2": {
                 "prototype": "digit/ui/slider.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "verticalSlider2"},
                     "axis": "vertical"
                 }
diff --git a/test/spec/text-area/text-area-test.html b/test/spec/text-area/text-area-test.html
index 1296b98..4cf2eef 100644
--- a/test/spec/text-area/text-area-test.html
+++ b/test/spec/text-area/text-area-test.html
@@ -12,14 +12,14 @@
 
             "textArea": {
                 "prototype": "digit/ui/text-area.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "textArea"}
                 }
             },
 
             "textAreaWithAttributes": {
                 "prototype": "digit/ui/text-area.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "textAreaWithAttributes"}
                 }
             }
diff --git a/test/spec/text-field/text-field-test.html b/test/spec/text-field/text-field-test.html
index a2624f2..6a60fca 100644
--- a/test/spec/text-field/text-field-test.html
+++ b/test/spec/text-field/text-field-test.html
@@ -8,7 +8,7 @@
         {
             "test": {
                 "prototype": "spec/text-field/text-field-test[Test]",
-                "properties": {
+                "values": {
                     "textField": {"@": "textField"},
                     "textFieldWithAttributes": {"@": "textFieldWithAttributes"}
                 }
@@ -16,14 +16,14 @@
 
             "textField": {
                 "prototype": "digit/ui/text-field.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "textField"}
                 }
             },
 
             "textFieldWithAttributes": {
                 "prototype": "digit/ui/text-field.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "textFieldWithAttributes"}
                 }
             }
diff --git a/test/spec/toggle-switch/toggle-switch-test.html b/test/spec/toggle-switch/toggle-switch-test.html
index c5b787f..454731e 100644
--- a/test/spec/toggle-switch/toggle-switch-test.html
+++ b/test/spec/toggle-switch/toggle-switch-test.html
@@ -8,14 +8,14 @@
         {
             "test": {
                 "prototype": "spec/toggle-switch/toggle-switch-test[Test]",
-                "properties": {
+                "values": {
                     "toggleSwitch": {"@": "toggleSwitch"}
                 }
             },
 
             "toggleSwitch": {
                 "prototype": "digit/ui/toggle-switch.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "toggleSwitch"}
                 }
             }
diff --git a/test/spec/video/video-test.html b/test/spec/video/video-test.html
index cfa9153..7ef107c 100644
--- a/test/spec/video/video-test.html
+++ b/test/spec/video/video-test.html
@@ -8,14 +8,14 @@
         {
             "test": {
                 "prototype": "spec/video/video-test[Test]",
-                "properties": {
+                "values": {
                     "video": {"@": "video"}
                 }
             },
 
             "video": {
                 "prototype": "digit/ui/video.reel",
-                "properties": {
+                "values": {
                     "element": {"#": "video"},
                     "src": "digit/ui/video.reel/video.mov",
                     "posterSrc": "digit/ui/video.reel/poster.png"
diff --git a/ui/big-list.reel/big-list.html b/ui/big-list.reel/big-list.html
index bb75f46..40db4bd 100644
--- a/ui/big-list.reel/big-list.html
+++ b/ui/big-list.reel/big-list.html
@@ -9,9 +9,7 @@
             "values": {
                 "element": {"#": "digitList"},
                 "flow": {"@": "flow"},
-                "_scrollBars": {"@": "scrollbars"}
-            },
-            "bindings": {
+                "_scrollBars": {"@": "scrollbars"},
                 "_scroll": {"<->": "@flow.scroll"}
             }
         },
@@ -47,9 +45,7 @@
                     },
                     "headOffset": 0,
                     "tailOffset": 0
-                }]
-            },
-            "bindings": {
+                }],
                 "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"}
             }
         },
diff --git a/ui/list.reel/list.html b/ui/list.reel/list.html
index 5326f62..9ec7c56 100644
--- a/ui/list.reel/list.html
+++ b/ui/list.reel/list.html
@@ -14,9 +14,7 @@
             "repetition": {
                 "prototype": "montage/ui/repetition.reel",
                 "values": {
-                    "element": {"#": "repetition"}
-                },
-                "bindings": {
+                    "element": {"#": "repetition"},
                     "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"}
                 }
             },
@@ -24,9 +22,7 @@
             "scroller": {
                 "prototype": "ui/scroller.reel",
                 "values": {
-                    "element": {"#": "scroller"}
-                },
-                "bindings": {
+                    "element": {"#": "scroller"},
                     "axis": {"<-": "@owner.axis"}
                 }
             },
diff --git a/ui/number-field.reel/number-field.html b/ui/number-field.reel/number-field.html
index 36b92af..0c0562b 100644
--- a/ui/number-field.reel/number-field.html
+++ b/ui/number-field.reel/number-field.html
@@ -19,9 +19,7 @@
         "textField": {
             "prototype": "ui/text-field.reel",
             "values": {
-                "element": {"#": "textField"}
-            },
-            "bindings" : {
+                "element": {"#": "textField"},
                 "value": {"<->": "@owner.value"}
             }
         },
diff --git a/ui/scroller.reel/scroller.html b/ui/scroller.reel/scroller.html
index d4d902e..4ec5c23 100644
--- a/ui/scroller.reel/scroller.html
+++ b/ui/scroller.reel/scroller.html
@@ -33,9 +33,7 @@
             "minTranslateX": 0,
             "minTranslateY": 0,
             "invertAxis": true,
-            "listenToWheelEvent": true
-        },
-        "bindings": {
+            "listenToWheelEvent": true,
             "translateX": {"<->": "@owner.scrollX"},
             "translateY": {"<->": "@owner.scrollY"},
             "maxTranslateX": {"<-": "@owner._maxTranslateX"},
diff --git a/ui/video-control.reel/video-control-track.reel/video-control-track.html b/ui/video-control.reel/video-control-track.reel/video-control-track.html
index 00d1ed3..79e9cc1 100644
--- a/ui/video-control.reel/video-control-track.reel/video-control-track.html
+++ b/ui/video-control.reel/video-control-track.reel/video-control-track.html
@@ -15,9 +15,7 @@
             "prototype": "ui/video-control.reel/video-control-track.reel[Slider]",
             "values": {
                 "element": {"#": "slider"},
-                "_sliderThumbElement": {"#": "sliderThumb"}
-            },
-            "bindings": {
+                "_sliderThumbElement": {"#": "sliderThumb"},
                 "controller": {"<-": "@owner"}
             }
         },
@@ -26,9 +24,7 @@
             "prototype": "ui/video-control.reel/video-control-track.reel[ProgressBar]",
             "values": {
                 "element": {"#": "progress-bar"},
-                "_progressBarValueElement": {"#": "progress-bar-value"}
-            },
-            "bindings": {
+                "_progressBarValueElement": {"#": "progress-bar-value"},
                 "controller": {"<-": "@owner"}
             }
         }
diff --git a/ui/video-control.reel/video-control.html b/ui/video-control.reel/video-control.html
index b554980..68c96f8 100644
--- a/ui/video-control.reel/video-control.html
+++ b/ui/video-control.reel/video-control.html
@@ -28,9 +28,7 @@
         "track": {
             "prototype": "ui/video-control.reel/video-control-track.reel",
             "values": {
-                "element": {"#": "track"}
-            },
-            "bindings": {
+                "element": {"#": "track"},
                 "videoController": {"<-": "@owner.videoController"}
             }
         },
@@ -38,9 +36,7 @@
         "time": {
             "prototype": "montage/ui/text.reel",
             "values": {
-                "element": {"#": "time"}
-            },
-            "bindings": {
+                "element": {"#": "time"},
                 "value": {"<-": "@owner.formattedTime"}
             }
         },
diff --git a/ui/video.reel/video.html b/ui/video.reel/video.html
index e193f8c..16c5816 100644
--- a/ui/video.reel/video.html
+++ b/ui/video.reel/video.html
@@ -17,9 +17,7 @@
                 "prototype": "ui/video-control.reel",
                 "values": {
                     "element": {"#": "control"},
-                    "video": {"@": "owner"}
-                },
-                "bindings": {
+                    "video": {"@": "owner"},
                     "videoController": {"<-": "@owner.videoController"}
                 }
             },