From 12cdbfb9331ebd2b3dd04a66c8ad290e41430c0d Mon Sep 17 00:00:00 2001
From: Razvan Stoenescu <razvan.stoenescu@gmail.com>
Date: Sat, 10 Dec 2016 23:01:01 +0200
Subject: [PATCH] feat: Preparing v0.10 build

---
 dev/components/components/data-table.vue              | 11 ++++++-----
 dev/components/form/datetime.vue                      |  3 +++
 dev/components/form/dialog-select.vue                 |  3 +++
 dev/components/form/select.vue                        |  3 +++
 package.json                                          |  2 +-
 src/index.es6.js                                      |  2 +-
 src/index.js                                          |  2 +-
 src/vue-components/ajax-bar/AjaxBar.vue               |  2 ++
 src/vue-components/data-table/DataTable.vue           | 11 +++++------
 src/vue-components/data-table/TableContent.vue        |  2 +-
 .../data-table/plugins/sticky-cols/TableSticky.vue    |  2 +-
 src/vue-components/datetime/Datetime.vue              |  4 ++--
 .../picker-textfield/PickerTextfield.vue              |  4 ++--
 src/vue-components/select/DialogSelect.vue            |  4 ++--
 src/vue-components/select/Select.vue                  |  4 ++--
 15 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/dev/components/components/data-table.vue b/dev/components/components/data-table.vue
index 119136b584c..f0c10ed0045 100644
--- a/dev/components/components/data-table.vue
+++ b/dev/components/components/data-table.vue
@@ -179,7 +179,8 @@ export default {
         {
           label: 'Date',
           field: 'isodate',
-          style: {width: '120px'},
+          width: '120px',
+          classes: 'bg-orange-2',
           format (value) {
             return new Date(value).toLocaleString()
           }
@@ -193,26 +194,26 @@ export default {
             }
             return value
           },
-          style: {width: '80px'},
+          width: '80px',
           classes: 'text-center'
         },
         {
           label: 'Message',
           field: 'message',
           sort: true,
-          style: {width: '500px'}
+          width: '500px'
         },
         {
           label: 'Source',
           field: 'source',
           sort: true,
-          style: {width: '120px'}
+          width: '120px'
         },
         {
           label: 'Log Number',
           field: 'log_number',
           sort: true,
-          style: {width: '100px'}
+          width: '100px'
         }
       ],
 
diff --git a/dev/components/form/datetime.vue b/dev/components/form/datetime.vue
index 25c78aea760..c7460760357 100644
--- a/dev/components/form/datetime.vue
+++ b/dev/components/form/datetime.vue
@@ -60,6 +60,9 @@
       <p class="caption">With Placeholder</p>
       <q-datetime v-model="model" type="date" placeholder="Pick Date"></q-datetime>
 
+      <p class="caption">With Static Label</p>
+      <q-datetime v-model="model" type="date" static-label="Party Date"></q-datetime>
+
       <p class="caption">Disabled State</p>
       <q-datetime disable v-model="model" type="datetime"></q-datetime>
 
diff --git a/dev/components/form/dialog-select.vue b/dev/components/form/dialog-select.vue
index 898caede53f..251761f2581 100644
--- a/dev/components/form/dialog-select.vue
+++ b/dev/components/form/dialog-select.vue
@@ -14,6 +14,9 @@
       <p class="caption">With Placeholder</p>
       <q-dialog-select type="radio" v-model="select" :options="selectOptions" placeholder="Pick Company"></q-dialog-select>
 
+      <p class="caption">With Static Label</p>
+      <q-dialog-select type="radio" v-model="select" :options="selectOptions" static-label="Company"></q-dialog-select>
+
       <p class="caption">Disabled State</p>
       <q-dialog-select disable type="radio" v-model="select" :options="selectOptions"></q-dialog-select>
 
diff --git a/dev/components/form/select.vue b/dev/components/form/select.vue
index 96a189af66f..324cf566f94 100644
--- a/dev/components/form/select.vue
+++ b/dev/components/form/select.vue
@@ -14,6 +14,9 @@
       <p class="caption">With Placeholder</p>
       <q-select type="checkbox" v-model="multipleSelect" :options="selectOptions" placeholder="Pick Company"></q-select>
 
+      <p class="caption">With Static Label</p>
+      <q-select type="checkbox" v-model="multipleSelect" :options="selectOptions" static-label="Company"></q-select>
+
       <p class="caption">Disabled State</p>
       <q-select disable type="radio" v-model="select" :options="selectOptions"></q-select>
 
diff --git a/package.json b/package.json
index 0332628db75..f90d2631a95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quasar-framework",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Simultaneously build desktop/mobile SPA websites & phone/tablet apps with VueJS",
   "main": "dist/quasar.common.js",
   "jsnext:main": "dist/quasar.es6.js",
diff --git a/src/index.es6.js b/src/index.es6.js
index 8ff273681f4..7c6b786b34f 100644
--- a/src/index.es6.js
+++ b/src/index.es6.js
@@ -26,7 +26,7 @@ import Utils from './utils'
 import { LocalStorage, SessionStorage } from './features/web-storage'
 
 let Quasar = {
-  version: '0.9.1',
+  version: '0.10.0',
   install,
   start,
   theme
diff --git a/src/index.js b/src/index.js
index b3b37d1caae..d30bcffe24a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,7 +26,7 @@ import Utils from './utils'
 import { LocalStorage, SessionStorage } from './features/web-storage'
 
 let Quasar = {
-  version: '0.9.1',
+  version: '0.10.0',
   install,
   start,
   theme,
diff --git a/src/vue-components/ajax-bar/AjaxBar.vue b/src/vue-components/ajax-bar/AjaxBar.vue
index 48e839f4ed9..9f8be463fc1 100644
--- a/src/vue-components/ajax-bar/AjaxBar.vue
+++ b/src/vue-components/ajax-bar/AjaxBar.vue
@@ -128,6 +128,7 @@ export default {
         this.progress = 0
         this.active = true
         this.animate = false
+        this.$emit('start')
         this.timer = setTimeout(() => {
           this.animate = true
           this.move()
@@ -159,6 +160,7 @@ export default {
       }
       this.closing = true
       this.progress = 100
+      this.$emit('stop')
       this.timer = setTimeout(() => {
         this.closing = false
         this.active = false
diff --git a/src/vue-components/data-table/DataTable.vue b/src/vue-components/data-table/DataTable.vue
index 4095f5910aa..fbea7de7bdf 100644
--- a/src/vue-components/data-table/DataTable.vue
+++ b/src/vue-components/data-table/DataTable.vue
@@ -17,7 +17,7 @@
           v-if="config.columnPicker"
           v-model="columnSelection"
           :options="columnSelectionOptions"
-          fixed-label="Columns"
+          static-label="Columns"
           class="text-right"
           style="margin-left: 10px"
         ></q-select>
@@ -44,7 +44,7 @@
               <q-checkbox v-if="config.selection === 'multiple'" v-model="rowSelection[index]"></q-checkbox>
               <q-radio v-else v-model="rowSelection[0]" :val="index"></q-radio>
             </td>
-            <td v-for="col in cols" :data-th="col.label">
+            <td v-for="col in cols" :data-th="col.label" :style="col.style" :class="col.classes">
               <span v-if="!$scopedSlots['col-'+col.field]" v-html="format(row, col)"></span>
               <slot v-if="$scopedSlots['col-'+col.field]" :name="'col-'+col.field" :row="row" :col="col" :data="row[col.field]"></slot>
             </td>
@@ -68,7 +68,7 @@
           <tr v-for="row in rows" :style="rowStyle">
             <td v-if="config.selection"></td>
             <td v-for="n in leftStickyColumns"></td>
-            <td v-for="col in regularCols">
+            <td v-for="col in regularCols" :style="col.style" :class="col.classes">
               <span v-if="!$scopedSlots['col-'+col.field]" v-html="format(row, col)"></span>
               <slot v-if="$scopedSlots['col-'+col.field]" :name="'col-'+col.field" :row="row" :col="col" :data="row[col.field]"></slot>
             </td>
@@ -89,7 +89,7 @@
                 <q-checkbox v-if="config.selection === 'multiple'" v-model="rowSelection[index]"></q-checkbox>
                 <q-radio v-else v-model="rowSelection[0]" :val="index"></q-radio>
               </td>
-              <td v-for="n in leftStickyColumns">
+              <td v-for="n in leftStickyColumns" :style="cols[n-1].style" :class="cols[n-1].classes">
                 <span v-if="!$scopedSlots['col-'+cols[n-1].field]" v-html="format(row, cols[n-1])"></span>
                 <slot v-if="$scopedSlots['col-'+cols[n-1].field]" :name="'col-'+cols[n-1].field" :row="row" :col="cols[n-1]" :data="row[cols[n-1].field]"></slot>
               </td>
@@ -111,7 +111,7 @@
             <tr v-for="row in rows" :style="rowStyle">
               <td v-if="config.selection" class="invisible"></td>
               <td v-for="n in cols.length - rightStickyColumns" class="invisible"></td>
-              <td v-for="n in rightStickyColumns">
+              <td v-for="n in rightStickyColumns" :style="rightCols[n-1].style">
                 <span v-if="!$scopedSlots['col-'+rightCols[n-1].field]" v-html="format(row, rightCols[n-1])"></span>
                 <slot v-if="$scopedSlots['col-'+rightCols[n-1].field]" :name="'col-'+rightCols[n-1].field" :row="row" :col="rightCols[n-1]" :data="row[rightCols[n-1].field]"></slot>
               </td>
@@ -227,7 +227,6 @@ export default {
     refresh (state) {
       if (state === false) {
         this.refreshing = false
-        return
       }
       else if (state === true || !this.refreshing) {
         this.refreshing = true
diff --git a/src/vue-components/data-table/TableContent.vue b/src/vue-components/data-table/TableContent.vue
index cc0c36133ed..4aa5a092db5 100644
--- a/src/vue-components/data-table/TableContent.vue
+++ b/src/vue-components/data-table/TableContent.vue
@@ -2,7 +2,7 @@
   <table class="q-table horizontal-delimiter" :style="tableStyle">
     <colgroup>
       <col v-if="selection" style="width: 45px;" />
-      <col v-for="col in cols" :style="col.style" />
+      <col v-for="col in cols" :style="{width: col.width}" />
       <col v-if="head && scroll.horiz" :style="{width: scroll.horiz}" />
     </colgroup>
     <thead v-if="head">
diff --git a/src/vue-components/data-table/plugins/sticky-cols/TableSticky.vue b/src/vue-components/data-table/plugins/sticky-cols/TableSticky.vue
index e5625462932..8c5ddf199d4 100644
--- a/src/vue-components/data-table/plugins/sticky-cols/TableSticky.vue
+++ b/src/vue-components/data-table/plugins/sticky-cols/TableSticky.vue
@@ -2,7 +2,7 @@
   <table class="q-table horizontal-delimiter">
     <colgroup>
       <col v-if="selection" style="width: 45px;" />
-      <col v-for="col in cols" :style="col.style" />
+      <col v-for="col in cols" :style="{width: col.width}" />
     </colgroup>
     <thead>
       <tr>
diff --git a/src/vue-components/datetime/Datetime.vue b/src/vue-components/datetime/Datetime.vue
index 104ade0f1e3..09b5695e115 100644
--- a/src/vue-components/datetime/Datetime.vue
+++ b/src/vue-components/datetime/Datetime.vue
@@ -4,7 +4,7 @@
     :readonly="readonly"
     :label="label"
     :placeholder="placeholder"
-    :fixed-label="fixedLabel"
+    :static-label="staticLabel"
     :value="actualValue"
     @click.native="__open()"
   >
@@ -97,7 +97,7 @@ export default {
     },
     label: String,
     placeholder: String,
-    fixedLabel: String,
+    staticLabel: String,
     readonly: Boolean,
     disable: Boolean
   },
diff --git a/src/vue-components/picker-textfield/PickerTextfield.vue b/src/vue-components/picker-textfield/PickerTextfield.vue
index 487ca80eeea..b40e6306d69 100644
--- a/src/vue-components/picker-textfield/PickerTextfield.vue
+++ b/src/vue-components/picker-textfield/PickerTextfield.vue
@@ -14,7 +14,7 @@ export default {
   props: {
     label: String,
     placeholder: String,
-    fixedLabel: String,
+    staticLabel: String,
     value: String,
     disable: Boolean,
     readonly: Boolean
@@ -24,7 +24,7 @@ export default {
       return this.value.length > 0
     },
     actualValue () {
-      return this.fixedLabel || (this.label ? this.value : this.value || this.placeholder)
+      return this.staticLabel || (this.label ? this.value : this.value || this.placeholder)
     }
   }
 }
diff --git a/src/vue-components/select/DialogSelect.vue b/src/vue-components/select/DialogSelect.vue
index 47b150abe6c..e3faf96cdbb 100644
--- a/src/vue-components/select/DialogSelect.vue
+++ b/src/vue-components/select/DialogSelect.vue
@@ -4,7 +4,7 @@
     :readonly="readonly"
     :label="label"
     :placeholder="placeholder"
-    :fixed-label="fixedLabel"
+    :static-label="staticLabel"
     :value="actualValue"
     @click.native="pick()"
   ></q-picker-textfield>
@@ -49,7 +49,7 @@ export default {
     message: String,
     label: String,
     placeholder: String,
-    fixedLabel: String,
+    staticLabel: String,
     readonly: Boolean,
     disable: Boolean
   },
diff --git a/src/vue-components/select/Select.vue b/src/vue-components/select/Select.vue
index f3932ed57cd..e412a60907a 100644
--- a/src/vue-components/select/Select.vue
+++ b/src/vue-components/select/Select.vue
@@ -4,7 +4,7 @@
     :readonly="readonly"
     :label="label"
     :placeholder="placeholder"
-    :fixed-label="fixedLabel"
+    :static-label="staticLabel"
     :value="actualValue"
   >
     <q-popover ref="popover" :disable="disable || readonly">
@@ -58,7 +58,7 @@ export default {
     },
     label: String,
     placeholder: String,
-    fixedLabel: String,
+    staticLabel: String,
     readonly: Boolean,
     disable: Boolean
   },