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 @@
With Placeholder
+ With Static Label
+
+
Disabled State
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 @@
With Placeholder
+ With Static Label
+
+
Disabled State
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 @@
With Placeholder
+ With Static Label
+
+
Disabled State
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"
>
@@ -44,7 +44,7 @@
-
+ |
|
@@ -68,7 +68,7 @@
|
|
-
+ |
|
@@ -89,7 +89,7 @@
-
+ |
|
@@ -111,7 +111,7 @@
|
|
-
+ |
|
@@ -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 @@
-
+
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 @@
-
+
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()"
>
@@ -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"
>
@@ -58,7 +58,7 @@ export default {
},
label: String,
placeholder: String,
- fixedLabel: String,
+ staticLabel: String,
readonly: Boolean,
disable: Boolean
},