Skip to content

Commit

Permalink
fix: #252 Worked around rollup-plugin-vue issue and repackaged v0.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Dec 14, 2016
1 parent 6074b04 commit b92204e
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 22 deletions.
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "quasar-framework",
"version": "0.10.2",
"version": "0.10.3",
"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 Expand Up @@ -48,7 +48,7 @@
"babel-loader": "^6.2.5",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "^6.16.0",
"babel-preset-es2015-rollup": "^1.2.0",
"babel-preset-es2015-rollup": "^3.0.0",
"babel-preset-stage-2": "^6.17.0",
"colors": "^1.1.2",
"connect-history-api-fallback": "^1.3.0",
Expand All @@ -70,25 +70,26 @@
"material-design-icons": "^3.0.1",
"moment": "^2.15.1",
"opn": "^4.0.2",
"parse5": "^2.2.3",
"postcss-loader": "^1.0.0",
"progress-bar-webpack-plugin": "^1.9.0",
"raw-loader": "^0.5.1",
"roboto-fontface": "^0.6.0",
"rollup": "^0.36.1",
"rollup": "^0.37.0",
"rollup-plugin-babel": "^2.6.1",
"rollup-plugin-string": "^2.0.2",
"rollup-plugin-vue": "2.2.8",
"rollup-plugin-vue": "2.2.13",
"shelljs": "^0.7.0",
"stylint": "^1.5.6",
"stylus": "^0.54.5",
"stylus-loader": "^2.1.1",
"url-loader": "^0.5.7",
"velocity-animate": "^1.2.3",
"vue": "2.1.4",
"vue": "^2.1.6",
"vue-loader": "^10.0.0",
"vue-router": "^2.0.0",
"vue-style-loader": "^1.0.0",
"vue-template-compiler": "2.1.4",
"vue-template-compiler": "^2.1.6",
"webpack": "^2.1.0-beta.27",
"webpack-dev-middleware": "^1.8.4",
"webpack-hot-middleware": "^2.13.2",
Expand All @@ -98,6 +99,6 @@
"fastclick": "1.x",
"moment": "2.x",
"velocity-animate": "1.x",
"vue": "^2.0.0"
"vue": "^2.1.0"
}
}
2 changes: 1 addition & 1 deletion src/components/toast/Toast.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="q-toast-container"
:class="{active}"
:class="{active: active}"
>
<div
class="q-toast row no-wrap items-center non-selectable"
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.10.2',
version: '0.10.3',
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.10.2',
version: '0.10.3',
install,
start,
theme,
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/chips/Chips.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div
class="q-chips group textfield"
@click="focus"
:class="{active, disabled: disable, readonly}"
:class="{active: active, disabled: disable, readonly: readonly}"
>
<span
class="chip label bg-light text-grey-9"
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/datetime/InlineDatetimeMat.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="q-datetime inline column gt-md-row" :class="{disabled: disable, readonly}">
<div class="q-datetime inline column gt-md-row" :class="{disabled: disable, readonly: readonly}">
<div class="q-datetime-header column justify-center" v-if="!value">&nbsp;</div>
<div class="q-datetime-header column justify-center" v-else>
<div v-if="typeHasDate">
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/fab/Fab.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="q-fab flex inline justify-center"
:class="{opened}"
:class="{opened: opened}"
>
<div class="backdrop animate-fade" @click="toggle(true)"></div>
<button class="circular raised" @click="toggle()" :class="classNames">
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/numeric/Numeric.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="q-numeric textfield row inline items-center" :class="{disabled: disable, readonly}">
<div class="q-numeric textfield row inline items-center" :class="{disabled: disable, readonly: readonly}">
<i @click="__setByOffset(-1)">remove</i>
<input
class="no-style auto q-input-field"
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/picker-textfield/PickerTextfield.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="q-picker-textfield cursor-pointer textfield caret"
:class="{disabled: disable, readonly, active, 'with-label': label}"
:class="{disabled: disable, readonly: readonly, active: active, 'with-label': label}"
>
<div class="q-picker-textfield-label ellipsis" v-html="label"></div>
<div class="q-picker-textfield-value ellipsis" v-html="actualValue"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/progress-button/ProgressButton.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<button class="q-progress-button" :class="{active, indeterminate}">
<button class="q-progress-button" :class="{active: active, indeterminate: indeterminate}">
<span
v-if="!indeterminate"
class="q-progress-button-filler"
Expand Down
6 changes: 3 additions & 3 deletions src/vue-components/range/DoubleRange.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
></div>
<div
class="q-range-track active-track"
:class="{dragging, 'track-draggable': dragRange}"
:class="{dragging: dragging, 'track-draggable': dragRange}"
:style="{left: percentageMin * 100 + '%', width: activeTrackWidth}"
></div>
<div
class="q-range-handle q-range-handle-min"
:style="{left: percentageMin * 100 + '%'}"
:class="{dragging, 'handle-at-minimum': value.min === min, undraggable: disableMin}"
:class="{dragging: dragging, 'handle-at-minimum': value.min === min, undraggable: disableMin}"
>
<div
class="q-range-label"
Expand All @@ -34,7 +34,7 @@
<div
class="q-range-handle q-range-handle-max"
:style="{left: percentageMax * 100 + '%'}"
:class="{dragging, 'handle-at-maximum': value.max === max, undraggable: disableMax}"
:class="{dragging: dragging, 'handle-at-maximum': value.max === max, undraggable: disableMax}"
>
<div
class="q-range-label"
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/range/Range.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div
class="q-range-handle"
:style="{left: percentage}"
:class="{dragging, 'handle-at-minimum': value === min}"
:class="{dragging: dragging, 'handle-at-minimum': value === min}"
>
<div
class="q-range-label"
Expand Down
2 changes: 1 addition & 1 deletion src/vue-components/search/Search.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="q-search"
:class="{'q-search-centered': centered, disabled: disable, readonly}"
:class="{'q-search-centered': centered, disabled: disable, readonly: readonly}"
>
<div class="q-search-input-container">
<button class="q-search-icon">
Expand Down
8 changes: 7 additions & 1 deletion src/vue-components/tab/Tab.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<template>
<div
class="q-tab items-center justify-center"
:class="{active: isActive, hidden, disabled: disable, hideIcon: hide === 'icon', hideLabel: hide === 'label'}"
:class="{
active: isActive,
hidden: hidden,
disabled: disable,
hideIcon: hide === 'icon',
hideLabel: hide === 'label'
}"
@click="activate()"
>
<router-link v-if="route" ref="routerLink" :to="route" :replace="replace" :append="append" :exact="exact"></router-link>
Expand Down

0 comments on commit b92204e

Please sign in to comment.