Skip to content

Bugs/deprecated properties and bindings #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hthetiot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bugs/deprecated properties and bindings #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f532f16
fix 'properties' block is deprecated, use 'values' instead
hthetiot Nov 29, 2017
fa01c1f
merge master
hthetiot Nov 29, 2017
9d21e78
fix 'properties' block is deprecated, use 'values' instead
hthetiot Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* global module */

// Karma configuration
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"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",
Expand Down
4 changes: 2 additions & 2 deletions test/spec/button/button-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/spec/checkbox/checkbox-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
{
"test": {
"prototype": "spec/checkbox/checkbox-test[Test]",
"properties": {
"values": {
"checkbox": {"@": "checkbox"},
"checkboxAttributeChecked": {"@": "checkboxChecked"}
}
},

"checkbox": {
"prototype": "digit/ui/checkbox.reel",
"properties": {
"values": {
"element": {"#": "checkbox"}
}
},

"checkboxChecked": {
"prototype": "digit/ui/checkbox.reel",
"properties": {
"values": {
"element": {"#": "checkboxChecked"}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/spec/list/list-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
{
"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]
}
},

"listItem1": {
"prototype": "digit/ui/list-item.reel",
"properties": {
"values": {
"element": {"#": "listItem1"}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/spec/number-field/number-field-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
{
"test": {
"prototype": "spec/number-field/number-field-test[Test]",
"properties": {
"values": {
"numberField": {"@": "numberField"},
"numberFieldWithAttributes": {"@": "attributes"}
}
},

"numberField": {
"prototype": "digit/ui/number-field.reel",
"properties": {
"values": {
"element": {"#": "numberField"}
}
},

"attributes": {
"prototype": "digit/ui/number-field.reel",
"properties": {
"values": {
"element": {"#": "attributes"}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/spec/radio-button/radio-button-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

"radioButton1": {
"prototype": "digit/ui/radio-button.reel",
"properties": {
"values": {
"element": {"#": "radioButton1"}
}
}
Expand Down
10 changes: 5 additions & 5 deletions test/spec/select/select-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{
"test": {
"prototype": "spec/select/select-test[Test]",
"properties": {
"values": {
"select": {"@": "select"},
"selectWithContent": {"@": "selectWithContent"},
"selectWithOptions": {"@": "selectWithOptions"},
Expand All @@ -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"},
Expand All @@ -39,14 +39,14 @@

"selectWithOptions": {
"prototype": "digit/ui/select.reel",
"properties": {
"values": {
"element": {"#": "selectWithOptions"}
}
},

"selectWithAttributes": {
"prototype": "digit/ui/select.reel",
"properties": {
"values": {
"element": {"#": "selectWithAttributes"}
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/spec/slider/slider-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@
{
"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"
}
},

"verticalSlider2": {
"prototype": "digit/ui/slider.reel",
"properties": {
"values": {
"element": {"#": "verticalSlider2"},
"axis": "vertical"
}
Expand Down
4 changes: 2 additions & 2 deletions test/spec/text-area/text-area-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/spec/text-field/text-field-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
{
"test": {
"prototype": "spec/text-field/text-field-test[Test]",
"properties": {
"values": {
"textField": {"@": "textField"},
"textFieldWithAttributes": {"@": "textFieldWithAttributes"}
}
},

"textField": {
"prototype": "digit/ui/text-field.reel",
"properties": {
"values": {
"element": {"#": "textField"}
}
},

"textFieldWithAttributes": {
"prototype": "digit/ui/text-field.reel",
"properties": {
"values": {
"element": {"#": "textFieldWithAttributes"}
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/spec/toggle-switch/toggle-switch-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/spec/video/video-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ui/badge.reel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/badge.reel/badge.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"blueprint_parent": {
"prototype": "montage/core/meta/blueprint-reference",
"properties": {
"values": {
"valueReference": {
"blueprintName": "Text",
"prototypeName": "Text",
Expand All @@ -13,7 +13,7 @@
},
"root": {
"prototype": "montage/core/meta/module-blueprint",
"properties": {
"values": {
"name": "Badge",
"parent": {
"@": "blueprint_parent"
Expand Down
14 changes: 5 additions & 9 deletions ui/big-list.reel/big-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,22 @@
<script type="text/montage-serialization">
{
"owner": {
"properties": {
"values": {
"element": {"#": "digitList"},
"flow": {"@": "flow"},
"_scrollBars": {"@": "scrollbars"}
},
"bindings": {
"_scrollBars": {"@": "scrollbars"},
"_scroll": {"<->": "@flow.scroll"}
}
},
"scrollbars": {
"prototype": "ui/scroller.reel/scroll-bars.reel",
"properties": {
"values": {
"element": {"#": "scrollbars"}
}
},
"flow": {
"prototype": "montage/ui/flow.reel",
"properties": {
"values": {
"element": {"#": "flow"},
"paths": [{
"knots": [
Expand All @@ -47,9 +45,7 @@
},
"headOffset": 0,
"tailOffset": 0
}]
},
"bindings": {
}],
"isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"}
}
},
Expand Down
Loading