Merge branch 'dev'

quasarframework · May 27, 2019 · f4a9f0c · f4a9f0c
2 parents f7e45b9 + 5d41f70
commit f4a9f0c
Show file tree

Hide file tree

Showing 22 changed files with 938 additions and 384 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ QScroller (@quasar/qscroller)
 [![GitHub repo size in bytes](https://img.shields.io/github/repo-size/quasarframework/app-extension-qscroller.svg)]()
 [![npm](https://img.shields.io/npm/dt/@quasar/quasar-app-extension-qscroller.svg)](https://www.npmjs.com/package/@quasar/quasar-app-extension-qscroller)
 
-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.
+QScroller is an `UI App Extension` for [Quasar Framework v1](https://quasar.dev/). It will not work with legacy versions of Quasar Framework.
 
 This work is currently in `alpha` and there are expected changes while things get worked out. Your help with testing is greatly appreciated.
 

diff --git a/demo/package.json b/demo/package.json
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.1.2",
-    "quasar": "^1.0.0-beta.23"
+    "quasar": "^1.0.0-rc.2"
   },
   "devDependencies": {
-    "@quasar/app": "^1.0.0-beta.24",
-    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.8",
+    "@quasar/app": "^1.0.0-rc.4",
+    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.9",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "eslint": "^5.10.0",

diff --git a/demo/src/layouts/MainLayout.vue b/demo/src/layouts/MainLayout.vue
@@ -38,13 +38,13 @@
     >
       <q-list>
         <q-item-label header>Essential Links</q-item-label>
-        <q-item clickable tag="a" target="_blank" href="http://v1.quasar-framework.org">
+        <q-item clickable tag="a" target="_blank" href="http://quasar.dev">
           <q-item-section avatar>
             <q-icon name="school" />
           </q-item-section>
           <q-item-section>
             <q-item-label>Docs</q-item-label>
-            <q-item-label caption>v1.quasar-framework.org</q-item-label>
+            <q-item-label caption>quasar.dev</q-item-label>
           </q-item-section>
         </q-item>
         <q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
@@ -56,22 +56,22 @@
             <q-item-label caption>github.com/quasarframework</q-item-label>
           </q-item-section>
         </q-item>
-        <q-item clickable tag="a" target="_blank" href="http://chat.quasar-framework.org">
+        <q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
           <q-item-section avatar>
             <q-icon name="chat" />
           </q-item-section>
           <q-item-section>
             <q-item-label>Discord Chat Channel</q-item-label>
-            <q-item-label caption>chat.quasar-framework.org</q-item-label>
+            <q-item-label caption>chat.quasar.dev</q-item-label>
           </q-item-section>
         </q-item>
-        <q-item clickable tag="a" target="_blank" href="https://forum.quasar-framework.org">
+        <q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
           <q-item-section avatar>
             <q-icon name="record_voice_over" />
           </q-item-section>
           <q-item-section>
             <q-item-label>Forum</q-item-label>
-            <q-item-label caption>forum.quasar-framework.org</q-item-label>
+            <q-item-label caption>forum.quasar.dev</q-item-label>
           </q-item-section>
         </q-item>
         <q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">

diff --git a/demo/src/layouts/ScrollerLayout.vue b/demo/src/layouts/ScrollerLayout.vue
@@ -53,13 +53,13 @@
           label="Essential Links"
         >
           <q-list>
-            <q-item clickable tag="a" target="_blank" href="http://v1.quasar-framework.org">
+            <q-item clickable tag="a" target="_blank" href="http://quasar.dev">
               <q-item-section avatar>
                 <q-icon name="school"></q-icon>
               </q-item-section>
               <q-item-section>
                 <q-item-label>Docs</q-item-label>
-                <q-item-label caption>v1.quasar-framework.org</q-item-label>
+                <q-item-label caption>quasar.dev</q-item-label>
               </q-item-section>
             </q-item>
             <q-item clickable tag="a" target="_blank" href="https://github.com/quasarframework/">
@@ -71,22 +71,22 @@
                 <q-item-label caption>github.com/quasarframework</q-item-label>
               </q-item-section>
             </q-item>
-            <q-item clickable tag="a" target="_blank" href="http://chat.quasar-framework.org">
+            <q-item clickable tag="a" target="_blank" href="http://chat.quasar.dev">
               <q-item-section avatar>
                 <q-icon name="chat"></q-icon>
               </q-item-section>
               <q-item-section>
                 <q-item-label>Discord Chat Channel</q-item-label>
-                <q-item-label caption>chat.quasar-framework.org</q-item-label>
+                <q-item-label caption>chat.quasar.dev</q-item-label>
               </q-item-section>
             </q-item>
-            <q-item clickable tag="a" target="_blank" href="https://forum.quasar-framework.org">
+            <q-item clickable tag="a" target="_blank" href="https://forum.quasar.dev">
               <q-item-section avatar>
                 <q-icon name="record_voice_over"></q-icon>
               </q-item-section>
               <q-item-section>
                 <q-item-label>Forum</q-item-label>
-                <q-item-label caption>forum.quasar-framework.org</q-item-label>
+                <q-item-label caption>forum.quasar.dev</q-item-label>
               </q-item-section>
             </q-item>
             <q-item clickable tag="a" target="_blank" href="https://twitter.com/quasarframework">

diff --git a/demo/src/markdown/scroller.md b/demo/src/markdown/scroller.md
@@ -3,7 +3,7 @@ QScroller Components
 
 > Please note, this is currently a work-in-progress (WIP) and not yet release to NPM as an installable package.
 
-**QScroller** is a [Quasar App Extension](https://v1.quasar-framework.org/app-extensions/introduction). There are many components avalable:
+**QScroller** is a [Quasar App Extension](https://quasar.dev/app-extensions/introduction). There are many components avalable:
 - QScroller
 - QTimeScroller
 - QTimeRangeScroller
@@ -74,6 +74,15 @@ data: [
 ]
 ```
 
+Additionally, there is one other property that can be added to the array of objects and this is the `display` property. 
+
+For example:
+```js
+{ value: '1', display: 'Anteater', noCaps: true, icon: '', iconRight: '', disabled: false, align: 'around' },
+```
+
+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.
+
 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.
 
 ## QTimeScroller