Skip to content

Commit f4a9f0c

Browse files
committed
Merge branch 'dev'
2 parents f7e45b9 + 5d41f70 commit f4a9f0c

22 files changed

+938
-384
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QScroller (@quasar/qscroller)
77
[![GitHub repo size in bytes](https://img.shields.io/github/repo-size/quasarframework/app-extension-qscroller.svg)]()
88
[![npm](https://img.shields.io/npm/dt/@quasar/quasar-app-extension-qscroller.svg)](https://www.npmjs.com/package/@quasar/quasar-app-extension-qscroller)
99

10-
QScroller is an `UI App Extension` for [Quasar Framework v1](https://v1.quasar-framework.org/). It will not work with legacy versions of Quasar Framework.
10+
QScroller is an `UI App Extension` for [Quasar Framework v1](https://quasar.dev/). It will not work with legacy versions of Quasar Framework.
1111

1212
This work is currently in `alpha` and there are expected changes while things get worked out. Your help with testing is greatly appreciated.
1313

demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
},
1414
"dependencies": {
1515
"@quasar/extras": "^1.1.2",
16-
"quasar": "^1.0.0-beta.23"
16+
"quasar": "^1.0.0-rc.2"
1717
},
1818
"devDependencies": {
19-
"@quasar/app": "^1.0.0-beta.24",
20-
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.8",
19+
"@quasar/app": "^1.0.0-rc.4",
20+
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.9",
2121
"@vue/eslint-config-standard": "^4.0.0",
2222
"babel-eslint": "^10.0.1",
2323
"eslint": "^5.10.0",

demo/src/layouts/MainLayout.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
>
3939
<q-list>
4040
<q-item-label header>Essential Links</q-item-label>
41-
<q-item clickable tag="a" target="_blank" href="http://v1.quasar-framework.org">
41+
<q-item clickable tag="a" target="_blank" href="http://quasar.dev">
4242
<q-item-section avatar>
4343
<q-icon name="school" />
4444
</q-item-section>
4545
<q-item-section>
4646
<q-item-label>Docs</q-item-label>
47-
<q-item-label caption>v1.quasar-framework.org</q-item-label>
47+
<q-item-label caption>quasar.dev</q-item-label>
4848
</q-item-section>
4949
</q-item>
5050
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
@@ -56,22 +56,22 @@
5656
<q-item-label caption>github.com/quasarframework</q-item-label>
5757
</q-item-section>
5858
</q-item>
59-
<q-item clickable tag="a" target="_blank" href="http://chat.quasar-framework.org">
59+
<q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
6060
<q-item-section avatar>
6161
<q-icon name="chat" />
6262
</q-item-section>
6363
<q-item-section>
6464
<q-item-label>Discord Chat Channel</q-item-label>
65-
<q-item-label caption>chat.quasar-framework.org</q-item-label>
65+
<q-item-label caption>chat.quasar.dev</q-item-label>
6666
</q-item-section>
6767
</q-item>
68-
<q-item clickable tag="a" target="_blank" href="https://forum.quasar-framework.org">
68+
<q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
6969
<q-item-section avatar>
7070
<q-icon name="record_voice_over" />
7171
</q-item-section>
7272
<q-item-section>
7373
<q-item-label>Forum</q-item-label>
74-
<q-item-label caption>forum.quasar-framework.org</q-item-label>
74+
<q-item-label caption>forum.quasar.dev</q-item-label>
7575
</q-item-section>
7676
</q-item>
7777
<q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">

demo/src/layouts/ScrollerLayout.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
label="Essential Links"
5454
>
5555
<q-list>
56-
<q-item clickable tag="a" target="_blank" href="http://v1.quasar-framework.org">
56+
<q-item clickable tag="a" target="_blank" href="http://quasar.dev">
5757
<q-item-section avatar>
5858
<q-icon name="school"></q-icon>
5959
</q-item-section>
6060
<q-item-section>
6161
<q-item-label>Docs</q-item-label>
62-
<q-item-label caption>v1.quasar-framework.org</q-item-label>
62+
<q-item-label caption>quasar.dev</q-item-label>
6363
</q-item-section>
6464
</q-item>
6565
<q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
@@ -71,22 +71,22 @@
7171
<q-item-label caption>github.com/quasarframework</q-item-label>
7272
</q-item-section>
7373
</q-item>
74-
<q-item clickable tag="a" target="_blank" href="http://chat.quasar-framework.org">
74+
<q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
7575
<q-item-section avatar>
7676
<q-icon name="chat"></q-icon>
7777
</q-item-section>
7878
<q-item-section>
7979
<q-item-label>Discord Chat Channel</q-item-label>
80-
<q-item-label caption>chat.quasar-framework.org</q-item-label>
80+
<q-item-label caption>chat.quasar.dev</q-item-label>
8181
</q-item-section>
8282
</q-item>
83-
<q-item clickable tag="a" target="_blank" href="https://forum.quasar-framework.org">
83+
<q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
8484
<q-item-section avatar>
8585
<q-icon name="record_voice_over"></q-icon>
8686
</q-item-section>
8787
<q-item-section>
8888
<q-item-label>Forum</q-item-label>
89-
<q-item-label caption>forum.quasar-framework.org</q-item-label>
89+
<q-item-label caption>forum.quasar.dev</q-item-label>
9090
</q-item-section>
9191
</q-item>
9292
<q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">

demo/src/markdown/scroller.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ QScroller Components
33

44
> Please note, this is currently a work-in-progress (WIP) and not yet release to NPM as an installable package.
55
6-
**QScroller** is a [Quasar App Extension](https://v1.quasar-framework.org/app-extensions/introduction). There are many components avalable:
6+
**QScroller** is a [Quasar App Extension](https://quasar.dev/app-extensions/introduction). There are many components avalable:
77
- QScroller
88
- QTimeScroller
99
- QTimeRangeScroller
@@ -74,6 +74,15 @@ data: [
7474
]
7575
```
7676

77+
Additionally, there is one other property that can be added to the array of objects and this is the `display` property.
78+
79+
For example:
80+
```js
81+
{ value: '1', display: 'Anteater', noCaps: true, icon: '', iconRight: '', disabled: false, align: 'around' },
82+
```
83+
84+
When this property is available, this is what will be displayed to the User, but when seleected, it's the `value` that will updated using the emit for the `input` event.
85+
7786
Then, your `v-model` variable should contain a `value` from your list for an initial selection. And, the `v-model` variable will be populated with `value` data upon user selection.
7887

7988
## QTimeScroller

0 commit comments

Comments
 (0)