Skip to content

Commit

Permalink
feat: Preparing v0.10 build
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Dec 10, 2016
1 parent 191fa35 commit 12cdbfb
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 24 deletions.
11 changes: 6 additions & 5 deletions dev/components/components/data-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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'
}
],
Expand Down
3 changes: 3 additions & 0 deletions dev/components/form/datetime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 3 additions & 0 deletions dev/components/form/dialog-select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 3 additions & 0 deletions dev/components/form/select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/index.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions src/vue-components/ajax-bar/AjaxBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -159,6 +160,7 @@ export default {
}
this.closing = true
this.progress = 100
this.$emit('stop')
this.timer = setTimeout(() => {
this.closing = false
this.active = false
Expand Down
11 changes: 5 additions & 6 deletions src/vue-components/data-table/DataTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -227,7 +227,6 @@ export default {
refresh (state) {
if (state === false) {
this.refreshing = false
return
}
else if (state === true || !this.refreshing) {
this.refreshing = true
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/data-table/TableContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/vue-components/datetime/Datetime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:readonly="readonly"
:label="label"
:placeholder="placeholder"
:fixed-label="fixedLabel"
:static-label="staticLabel"
:value="actualValue"
@click.native="__open()"
>
Expand Down Expand Up @@ -97,7 +97,7 @@ export default {
},
label: String,
placeholder: String,
fixedLabel: String,
staticLabel: String,
readonly: Boolean,
disable: Boolean
},
Expand Down
4 changes: 2 additions & 2 deletions src/vue-components/picker-textfield/PickerTextfield.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default {
props: {
label: String,
placeholder: String,
fixedLabel: String,
staticLabel: String,
value: String,
disable: Boolean,
readonly: Boolean
Expand All @@ -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)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/vue-components/select/DialogSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:readonly="readonly"
:label="label"
:placeholder="placeholder"
:fixed-label="fixedLabel"
:static-label="staticLabel"
:value="actualValue"
@click.native="pick()"
></q-picker-textfield>
Expand Down Expand Up @@ -49,7 +49,7 @@ export default {
message: String,
label: String,
placeholder: String,
fixedLabel: String,
staticLabel: String,
readonly: Boolean,
disable: Boolean
},
Expand Down
4 changes: 2 additions & 2 deletions src/vue-components/select/Select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -58,7 +58,7 @@ export default {
},
label: String,
placeholder: String,
fixedLabel: String,
staticLabel: String,
readonly: Boolean,
disable: Boolean
},
Expand Down

0 comments on commit 12cdbfb

Please sign in to comment.