chore: Final v0.7.0 build

quasarframework · Sep 18, 2016 · 64a6385 · 64a6385
1 parent 89e667f
commit 64a6385
Show file tree

Hide file tree

Showing 25 changed files with 138 additions and 99 deletions.
diff --git a/package.json b/package.json
@@ -100,6 +100,7 @@
     "raw-loader": "^0.5.1",
     "roboto-fontface": "^0.6.0",
     "rollup": "^0.34.1",
+    "rollup-plugin-babel": "^2.6.1",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-vue": "^2.0.1",
     "stylint": "^1.5.6",

diff --git a/src/components/action-sheet/action-sheet.js b/src/components/action-sheet/action-sheet.js
@@ -58,7 +58,8 @@ export default {
     .set({
       transitionIn: {translateY: [0, '101%']},
       transitionOut: {translateY: ['101%', 0]},
-      onBackButton: data.dismissButton.handler
+      onBackButton: data.dismissButton.handler,
+      onEscapeKey: data.dismissButton.handler
     })
 
     modal.$el.classList.remove('items-center')

diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
@@ -94,7 +94,7 @@ class Modal {
       options = {
         duration,
         complete: () => {
-          EscapeKey.register(() => { this.close() })
+          EscapeKey.register(() => { this.close(this.onEscapeKey) })
           this.__onShowHandlers.forEach(
             handler => { handler() }
           )

diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
@@ -42,7 +42,6 @@ function create (opts, defaults) {
   }
 
   toast.create(opts)
-  return toast
 }
 
 types.forEach(type => {

diff --git a/src/css-components/list/list.ios.styl b/src/css-components/list/list.ios.styl
@@ -12,19 +12,6 @@
   &.active, &.v-link-active
     background rgba(0, 0, 0, .2)
 
-  & + &
-    &.item-delimiter
-      border-top 1px solid rgb(224, 224, 224)
-    &.item-inset-delimiter
-      &:after
-        content ''
-        position absolute
-        top 0
-        left 72px
-        right 0
-        height 1px
-        background rgb(224, 224, 224)
-
   &.item-link
     cursor pointer
     &:active
@@ -191,6 +178,22 @@
   .item-smaller
     font-size 14px
 
+.item + .item,
+.item + .quasar-collapsible,
+.quasar-collapsible + .item,
+.quasar-collapsible + .quasar-collapsible
+  &.item-delimiter
+    border-top 1px solid rgb(224, 224, 224)
+  &.item-inset-delimiter
+    &:after
+      content ''
+      position absolute
+      top 0
+      left 72px
+      right 0
+      height 1px
+      background rgb(224, 224, 224)
+
 body.desktop .item.item-link:hover
   background rgba(0, 0, 0, .2)
 
@@ -234,10 +237,16 @@ body.desktop .item.item-link:hover
     background-color rgba(0, 0, 0, .1)
 
   &.item-delimiter
-    .item + .item
+    .item + .item,
+    .item + .quasar-collapsible,
+    .quasar-collapsible + .item,
+    .quasar-collapsible + .quasar-collapsible
       border-top 1px solid rgb(224, 224, 224)
   &.item-inset-delimiter
-    .item + .item
+    .item + .item,
+    .item + .quasar-collapsible,
+    .quasar-collapsible + .item,
+    .quasar-collapsible + .quasar-collapsible
       &:after
         content ''
         position absolute

diff --git a/src/css-components/list/list.mat.styl b/src/css-components/list/list.mat.styl
@@ -12,19 +12,6 @@
   &.active, &.v-link-active
     background rgba(0, 0, 0, .2)
 
-  & + &
-    &.item-delimiter
-      border-top 1px solid rgb(224, 224, 224)
-    &.item-inset-delimiter
-      &:after
-        content ''
-        position absolute
-        top 0
-        left 72px
-        right 0
-        height 1px
-        background rgb(224, 224, 224)
-
   &.item-link
     cursor pointer
     &:active
@@ -191,6 +178,22 @@
   .item-smaller
     font-size 14px
 
+.item + .item,
+.item + .quasar-collapsible,
+.quasar-collapsible + .item,
+.quasar-collapsible + .quasar-collapsible
+  &.item-delimiter
+    border-top 1px solid rgb(224, 224, 224)
+  &.item-inset-delimiter
+    &:after
+      content ''
+      position absolute
+      top 0
+      left 72px
+      right 0
+      height 1px
+      background rgb(224, 224, 224)
+
 body.desktop .item.item-link:hover
   background rgba(0, 0, 0, .2)
 
@@ -234,10 +237,16 @@ body.desktop .item.item-link:hover
     background-color rgba(0, 0, 0, .1)
 
   &.item-delimiter
-    .item + .item
+    .item + .item,
+    .item + .quasar-collapsible,
+    .quasar-collapsible + .item,
+    .quasar-collapsible + .quasar-collapsible
       border-top 1px solid rgb(224, 224, 224)
   &.item-inset-delimiter
-    .item + .item
+    .item + .item,
+    .item + .quasar-collapsible,
+    .quasar-collapsible + .item,
+    .quasar-collapsible + .quasar-collapsible
       &:after
         content ''
         position absolute

diff --git a/src/install.js b/src/install.js
@@ -83,7 +83,7 @@ function registerComponents (_Vue) {
   _Vue.component('quasar-collapsible', Collapsible)
   _Vue.component('quasar-context-menu', Platform.is.desktop ? ContextMenuDesktop : ContextMenuMobile)
   _Vue.component('quasar-inline-datetime', theme === 'ios' ? iOSInlineDatetime : MaterialInlineDatetime)
-  _Vue.component('quasar-datetime', Platform.is.desktop ? InputDatetimeDesktop : InputDatetimeMobile)
+  _Vue.component('quasar-datetime', Platform.is.desktop && !Platform.within.iframe ? InputDatetimeDesktop : InputDatetimeMobile)
   _Vue.component('quasar-drawer', Drawer)
   _Vue.component('quasar-drawer-link', DrawerLink)
   _Vue.component('quasar-fab', Fab)

diff --git a/src/themes/core/visibility.styl b/src/themes/core/visibility.styl
@@ -43,6 +43,17 @@ body
 .highlight-and-fade
   animation quasar-highlight 2s
 
+@keyframes quasar-rotate
+  0%
+    transform rotate(0)
+  25%
+    transform rotate(90deg)
+  50%
+    transform rotate(180deg)
+  75%
+    transform rotate(270deg)
+  100%
+    transform rotate(360deg)
 
 for type in desktop mobile cordova ios mat touch no-touch within-iframe
   body:not(.{type}) .{type}-only,

diff --git a/src/vue-components/collapsible/collapsible.ios.styl b/src/vue-components/collapsible/collapsible.ios.styl
@@ -1,17 +1,3 @@
-.quasar-collapsible
-  & + &
-    &.item-delimiter
-      border-top 1px solid rgb(224, 224, 224)
-    &.item-inset-delimiter
-      &:after
-        content ''
-        position absolute
-        top 0
-        left 72px
-        right 0
-        height 1px
-        background rgb(224, 224, 224)
-
 .quasar-collapsible-sub-item
   padding 8px 8px 8px 18px
 

diff --git a/src/vue-components/collapsible/collapsible.mat.styl b/src/vue-components/collapsible/collapsible.mat.styl
@@ -1,17 +1,3 @@
-.quasar-collapsible
-  & + &
-    &.item-delimiter
-      border-top 1px solid rgb(224, 224, 224)
-    &.item-inset-delimiter
-      &:after
-        content ''
-        position absolute
-        top 0
-        left 72px
-        right 0
-        height 1px
-        background rgb(224, 224, 224)
-
 .quasar-collapsible-sub-item
   padding 8px 8px 8px 18px
 

diff --git a/src/vue-components/context-menu/context-menu-desktop.vue b/src/vue-components/context-menu/context-menu-desktop.vue
@@ -11,7 +11,7 @@ import Utils from '../../utils'
 
 export default {
   props: {
-    disabled: {
+    disable: {
       type: Boolean,
       default: false,
       coerce: Boolean
@@ -32,7 +32,7 @@ export default {
     this.target = this.$el.parentNode
 
     this.handler = event => {
-      if (this.disabled) {
+      if (this.disable) {
         return
       }
       event.preventDefault()

diff --git a/src/vue-components/datetime/mat-inline-datetime.vue b/src/vue-components/datetime/mat-inline-datetime.vue
@@ -29,7 +29,7 @@
       </div>
       <div
         v-if="type === 'time' || type === 'datetime'"
-        class="quasar-datetime-time row gt-md-column justify-center"
+        class="quasar-datetime-time row gt-md-column items-center justify-center"
       >
         <div class="quasar-datetime-clockstring">
           <span

diff --git a/src/vue-components/drawer/drawer.vue b/src/vue-components/drawer/drawer.vue
@@ -298,7 +298,10 @@ export default {
       backdrop.style.background = 'rgba(0,0,0,' + percentage * backdropOpacity[theme.current] + ')'
     },
     setState (state, done) {
-      if (typeof state === 'boolean' && this.opened === state) {
+      if (
+        (!this.swipeOnly && Utils.dom.viewport().width > 600) ||
+        (typeof state === 'boolean' && this.opened === state)
+      ) {
         if (typeof done === 'function') {
           done()
         }
@@ -316,6 +319,12 @@ export default {
           this.setState(false)
         }
       }
+    },
+    open (done) {
+      this.setState(true, done)
+    },
+    close (done) {
+      this.setState(false, done)
     }
   },
   ready () {

diff --git a/src/vue-components/grid/grid.ios.styl b/src/vue-components/grid/grid.ios.styl
@@ -26,6 +26,7 @@
     tbody
       td
         display block
+        height auto !important
         text-align left !important
         width 100% !important
         padding 7px 10px

diff --git a/src/vue-components/grid/grid.mat.styl b/src/vue-components/grid/grid.mat.styl
@@ -26,6 +26,7 @@
     tbody
       td
         display block
+        height auto !important
         text-align left !important
         width 100% !important
         padding 7px 10px

diff --git a/src/vue-components/grid/grid.vue b/src/vue-components/grid/grid.vue
@@ -2,7 +2,6 @@
   <quasar-grid-table
     v-ref:table
     class="quasar-grid"
-    :title="title"
     :data="data | gridShowSelected showOnlySelected selectionMode singleSelection | filterBy searchQuery"
     :columns="columns"
     :rows-per-page="rowsPerPage"
@@ -17,7 +16,6 @@
 <script>
 export default {
   props: {
-    title: String,
     columns: {
       type: Array,
       required: true

diff --git a/src/vue-components/knob/knob.vue b/src/vue-components/knob/knob.vue
@@ -35,7 +35,7 @@
       class="quasar-knob-label row items-center justify-center content-center"
       :style="{color: color}"
     >
-      {{{ label || model }}}
+      {{{ placeholder || model }}}
     </div>
   </div>
 </template>
@@ -83,7 +83,7 @@ export default {
       type: Number,
       default: 1
     },
-    label: String
+    placeholder: String
   },
   computed: {
     svgStyle () {

diff --git a/src/vue-components/layout/layout.ios.styl b/src/vue-components/layout/layout.ios.styl
@@ -30,6 +30,11 @@ $toolbar-title-font-size   ?= 1.2rem
   .toolbar
     border-top $layout-border
 
+body.desktop
+  .layout-header, .layout-footer
+    button:hover i
+      animation quasar-rotate .25s ease-out
+
 .layout-content
   display flex
   flex 1 1 auto

diff --git a/src/vue-components/layout/layout.mat.styl b/src/vue-components/layout/layout.mat.styl
@@ -31,6 +31,11 @@ $toolbar-title-font-size   ?= 1.25rem
   order 10
   box-shadow $layout-footer-shadow
 
+body.desktop
+  .layout-header, .layout-footer
+    button:hover i
+      animation quasar-rotate .25s ease-out
+
 .layout-content
   display flex
   flex 1 1 auto

diff --git a/src/vue-components/pull-to-refresh/pull-to-refresh.vue b/src/vue-components/pull-to-refresh/pull-to-refresh.vue
@@ -56,6 +56,11 @@ export default {
     refreshIcon: {
       type: String,
       default: 'refresh'
+    },
+    disable: {
+      type: Boolean,
+      default: false,
+      coerce: Boolean
     }
   },
   data () {
@@ -81,6 +86,13 @@ export default {
       if (this.animating) {
         return
       }
+      if (this.disable) {
+        this.scrolling = false
+        this.pulling = false
+        this.animating = false
+        this.state = 'pull'
+        return
+      }
 
       if (!this.pulling) {
         if (this.state === 'refreshing') {

diff --git a/src/vue-components/select/dialog-select.vue b/src/vue-components/select/dialog-select.vue
@@ -17,7 +17,8 @@ let mapTypeConfig = {
 export default {
   props: {
     model: {
-      required: true
+      required: true,
+      twoWay: true
     },
     options: {
       type: Array,