From 883a30e5677456e460228b58ec4e09e817945640 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 6 Dec 2016 01:49:47 +0100 Subject: [PATCH 01/11] update prompt code example to be a prompt (#151) --- docs/src/pages/components/Dialog.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/src/pages/components/Dialog.vue b/docs/src/pages/components/Dialog.vue index 97e2ca0..a65f878 100644 --- a/docs/src/pages/components/Dialog.vue +++ b/docs/src/pages/components/Dialog.vue @@ -528,17 +528,16 @@
- <md-dialog-confirm - :md-title="confirm.title" - :md-content-html="confirm.contentHtml" - :md-ok-text="confirm.ok" - :md-cancel-text="confirm.cancel" + <md-dialog-prompt + :md-title="prompt.title" + :md-ok-text="prompt.ok" + :md-cancel-text="prompt.cancel" @open="onOpen" @close="onClose" - ref="dialog5"> - </md-dialog-confirm> + ref="dialog6"> + </md-dialog-prompt> - <md-button class="md-primary md-raised" @click="openDialog('dialog5')">Confirm</md-button> + <md-button class="md-primary md-raised" @click="openDialog('dialog6')">Prompt</md-button> From cdeb245fae0262ce1b1088bfcf68b2794ee2ca48 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 6 Dec 2016 20:49:31 +0100 Subject: [PATCH 02/11] add code sample to switch (#158) * Adding code sample to switch, fixing #157 * Added basic chips stuff * "revert chips stuff from merged commit" This reverts commit 367eea839a5eec7b982c82c2a10d199136999953. --- docs/src/pages/components/Switch.vue | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/src/pages/components/Switch.vue b/docs/src/pages/components/Switch.vue index 0d92631..d922851 100644 --- a/docs/src/pages/components/Switch.vue +++ b/docs/src/pages/components/Switch.vue @@ -96,7 +96,21 @@
+ <div> + <md-switch v-model="checked0" id="my-test0" name="my-test0"></md-switch> + </div> + <div> + <md-switch v-model="checked1" id="my-test1" name="my-test1" class="md-primary">Primary Color</md-switch> + </div> + + <div> + <md-switch v-model="checked2" id="my-test2" name="my-test2" class="md-warn">Warn Color</md-switch> + </div> + + <div> + <md-switch v-model="checked3" id="my-test3" name="my-test3" disabled>Disabled</md-switch> + </div>
@@ -112,7 +126,11 @@
+ <md-switch v-model="checked8" id="my-test8" name="my-test8">Default</md-switch> + <form @click.stop.prevent="submit"> + <md-switch type="submit" v-model="checked9" id="my-test9" name="my-test9" class="md-primary">Submit</md-switch> + </form>
@@ -138,7 +156,22 @@
+ <div v-md-theme="'orange'"> + <md-switch v-model="checked4" id="my-test4" name="my-test4" class="md-primary"></md-switch> + </div> + <div v-md-theme="'green'"> + <md-switch v-model="checked5" id="my-test5" name="my-test5" class="md-primary">Green Primary Color</md-switch> + </div> + + <div v-md-theme="'brown'"> + <md-switch v-model="checked6" id="my-test6" name="my-test6" class="md-primary">Brown Primary Color</md-switch> + </div> + + <div v-md-theme="'light-blue'"> + <md-switch v-model="checked7" id="my-test7" name="my-test7" class="md-primary" disabled>Light Blue Primary Color Disabled</md-switch> + </div> + </div>
From de4efeac7e3e79fb36c7854421ada3b868d16e23 Mon Sep 17 00:00:00 2001 From: Jonatas Walker Date: Wed, 7 Dec 2016 18:44:27 -0200 Subject: [PATCH 03/11] add reference of currentPage in mdTablePagination (#166) * Fix table pagination * use totalItems instead of mdTotal in the template --- src/components/mdTable/mdTablePagination.vue | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/mdTable/mdTablePagination.vue b/src/components/mdTable/mdTablePagination.vue index 1302c8c..205ba4f 100644 --- a/src/components/mdTable/mdTablePagination.vue +++ b/src/components/mdTable/mdTablePagination.vue @@ -6,13 +6,13 @@ {{ amount }} - {{ (currentSize - currentSize + 1) * currentPage }}-{{ currentSize }} {{ mdSeparator }} {{ mdTotal }} + {{ ((currentPage - 1) * currentSize) + 1 }}-{{ subTotal }} {{ mdSeparator }} {{ totalItems }} - + keyboard_arrow_left - + keyboard_arrow_right
@@ -45,6 +45,7 @@ }, data() { return { + subTotal: 0, currentSize: parseInt(this.mdSize, 10), currentPage: parseInt(this.mdPage, 10), totalItems: !isNaN(this.mdTotal) && Number.MAX_SAFE_INTEGER @@ -58,6 +59,9 @@ methods: { emitPaginationEvent() { if (this.canFireEvents) { + const sub = this.currentPage * this.currentSize; + + this.subTotal = sub > this.mdTotal ? this.mdTotal : sub; this.$emit('pagination', { size: this.currentSize, page: this.currentPage @@ -70,8 +74,16 @@ this.emitPaginationEvent(); } }, - changePage() { + previousPage() { if (this.canFireEvents) { + this.currentPage--; + this.$emit('page', this.currentPage); + this.emitPaginationEvent(); + } + }, + nextPage() { + if (this.canFireEvents) { + this.currentPage++; this.$emit('page', this.currentPage); this.emitPaginationEvent(); } @@ -79,6 +91,7 @@ }, mounted() { this.$nextTick(() => { + this.subTotal = this.currentPage * this.currentSize; this.mdPageOptions = this.mdPageOptions || [10, 25, 50, 100]; this.currentSize = this.mdPageOptions[0]; this.canFireEvents = true; From e8c83d0491a78cf47caa1f640d9191fad7b05fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20TOUZY?= Date: Wed, 7 Dec 2016 21:48:33 +0100 Subject: [PATCH 04/11] fix undefined object.values method and emit @change event (#167) * [fix] Object.values() not supported in IE/Safari #165 * [fix] mdTabs emit change event #168 * change var to let --- src/components/mdTabs/mdTabs.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/mdTabs/mdTabs.vue b/src/components/mdTabs/mdTabs.vue index 7e76eeb..112309e 100644 --- a/src/components/mdTabs/mdTabs.vue +++ b/src/components/mdTabs/mdTabs.vue @@ -152,10 +152,15 @@ this.contentWidth = width * this.activeTabNumber + 'px'; - Object.values(this.tabList).forEach((tab, index) => { + let index = 0; + + for (const tabId in this.tabList) { + let tab = this.tabList[tabId]; + tab.ref.width = width + 'px'; tab.ref.left = width * index + 'px'; - }); + index++; + } }, calculateContentHeight() { this.$nextTick(() => { @@ -189,6 +194,7 @@ this.activeTab = tabData.id; this.activeTabNumber = this.getTabIndex(this.activeTab); this.calculatePosition(); + this.$emit('change', this.activeTabNumber); } }, mounted() { From 6a552978832fc727255647480276da2759e3b0fe Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Wed, 7 Dec 2016 19:18:49 -0200 Subject: [PATCH 05/11] create custom tags in whiteframe component (#170) * create custom tags in whiteframe * add custom tag in api. fix #169 * add custom tag in examples. fix #169 --- docs/src/pages/Introduction.vue | 46 ++++++++++---------- docs/src/pages/components/Whiteframe.vue | 10 ++++- src/components/mdTabs/mdTabs.vue | 38 ++++++++-------- src/components/mdWhiteframe/mdWhiteframe.vue | 35 +++++++-------- 4 files changed, 66 insertions(+), 63 deletions(-) diff --git a/docs/src/pages/Introduction.vue b/docs/src/pages/Introduction.vue index 68db730..e4432bb 100644 --- a/docs/src/pages/Introduction.vue +++ b/docs/src/pages/Introduction.vue @@ -1,31 +1,33 @@ From 9cff66ae9bcf7a83bcdc6e3274dad0967c3f222c Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Wed, 7 Dec 2016 20:07:19 -0200 Subject: [PATCH 06/11] start improvement over huge dialog content --- docs/src/pages/components/Dialog.vue | 43 ++++++++++++++++++++++++++- src/components/mdDialog/mdDialog.scss | 9 ++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/docs/src/pages/components/Dialog.vue b/docs/src/pages/components/Dialog.vue index a65f878..22df957 100644 --- a/docs/src/pages/components/Dialog.vue +++ b/docs/src/pages/components/Dialog.vue @@ -280,11 +280,52 @@
- + + + + Lorem ipsum dolor sit amet + + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

+
+ Cancel Ok diff --git a/src/components/mdDialog/mdDialog.scss b/src/components/mdDialog/mdDialog.scss index 24449e4..cc05b22 100644 --- a/src/components/mdDialog/mdDialog.scss +++ b/src/components/mdDialog/mdDialog.scss @@ -34,6 +34,8 @@ min-width: 280px; max-width: 80%; max-height: 80%; + display: flex; + flex-flow: column; overflow: hidden; position: relative; z-index: 110; @@ -67,6 +69,13 @@ .md-dialog-content { padding: 0 24px 24px; + flex: 1; + overflow: auto; + background: linear-gradient(to bottom, #fff 0, #fff 1px, transparent 1px), + linear-gradient(to bottom, rgba(0, 0, 0, .12) 0, rgba(0, 0, 0, .12) 1px, transparent 1px), + linear-gradient(to top, #fff 0, #fff 1px, transparent 1px), + linear-gradient(to top, rgba(0, 0, 0, .12) 0, rgba(0, 0, 0, .12) 1px, transparent 1px); + background-attachment: local, scroll, local, scroll; &:first-child { padding-top: 24px; From 657e5d0c376f40e09129e83a71fa2f06a119e2d0 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Dec 2016 09:44:18 -0200 Subject: [PATCH 07/11] add scrollbar behaviour in dialog content fix #161 --- src/components/mdDialog/mdDialog.scss | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/components/mdDialog/mdDialog.scss b/src/components/mdDialog/mdDialog.scss index cc05b22..718735a 100644 --- a/src/components/mdDialog/mdDialog.scss +++ b/src/components/mdDialog/mdDialog.scss @@ -71,11 +71,12 @@ padding: 0 24px 24px; flex: 1; overflow: auto; + position: relative; background: linear-gradient(to bottom, #fff 0, #fff 1px, transparent 1px), - linear-gradient(to bottom, rgba(0, 0, 0, .12) 0, rgba(0, 0, 0, .12) 1px, transparent 1px), - linear-gradient(to top, #fff 0, #fff 1px, transparent 1px), - linear-gradient(to top, rgba(0, 0, 0, .12) 0, rgba(0, 0, 0, .12) 1px, transparent 1px); - background-attachment: local, scroll, local, scroll; + linear-gradient(to top, #fff 0, #fff 3px, transparent 3px), + linear-gradient(to bottom, rgba(#000, .12) 0, rgba(#000, .12) 1px, transparent 1px), + linear-gradient(to top, rgba(#000, .2) 1px, rgba(#000, .2) 2px, transparent 2px); + background-attachment: local, local, scroll, scroll; &:first-child { padding-top: 24px; @@ -100,8 +101,19 @@ min-height: 52px; padding: 8px 8px 8px 24px; display: flex; - justify-content: flex-end; align-items: center; + justify-content: flex-end; + position: relative; + + &:before { + height: 1px; + position: absolute; + top: -1px; + right: 0; + left: 0; + background-color: #fff; + content: " "; + } .md-button { min-width: 64px; From f0fdb3eab7e81cadf20356ec056ed2928a68945f Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Dec 2016 09:47:16 -0200 Subject: [PATCH 08/11] revert dialog example --- docs/src/pages/components/Dialog.vue | 43 +--------------------------- 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/docs/src/pages/components/Dialog.vue b/docs/src/pages/components/Dialog.vue index 22df957..a65f878 100644 --- a/docs/src/pages/components/Dialog.vue +++ b/docs/src/pages/components/Dialog.vue @@ -280,51 +280,10 @@
- - Lorem ipsum dolor sit amet - -

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolor adipisci quos consectetur eligendi deleniti, voluptatibus officia a, ut voluptas repudiandae recusandae commodi illum labore tempora ex quis quisquam doloremque sit.

-
+ Nemo, nobis necessitatibus ut illo, ducimus ex. Cancel From 4c01fc489bb8ac2ec0345415cff0a2385f92980e Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Dec 2016 09:57:24 -0200 Subject: [PATCH 09/11] resize textarea when a value change fix #160 --- src/components/mdInputContainer/mdInputContainer.scss | 2 +- src/components/mdInputContainer/mdTextarea.vue | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/mdInputContainer/mdInputContainer.scss b/src/components/mdInputContainer/mdInputContainer.scss index f3b09d0..85ca99d 100644 --- a/src/components/mdInputContainer/mdInputContainer.scss +++ b/src/components/mdInputContainer/mdInputContainer.scss @@ -62,8 +62,8 @@ $input-size: 32px; min-height: 32px; max-height: 230px; padding: 5px 0; - line-height: 1.3em; resize: none; + line-height: 1.3em; } .md-error { diff --git a/src/components/mdInputContainer/mdTextarea.vue b/src/components/mdInputContainer/mdTextarea.vue index 3001a20..df0a895 100644 --- a/src/components/mdInputContainer/mdTextarea.vue +++ b/src/components/mdInputContainer/mdTextarea.vue @@ -18,6 +18,13 @@ export default { mixins: [common], + watch: { + value() { + this.$nextTick(() => { + autosize.update(this.$el); + }); + } + }, mounted() { this.parentContainer = getClosestVueParent(this.$parent, 'md-input-container'); From 6dabd7960e07e1176d3ac244246eb6c86fbfd1b7 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Dec 2016 10:10:09 -0200 Subject: [PATCH 10/11] fix disabled selects being selectable. fix #159 --- .../mdInputContainer/mdInputContainer.scss | 2 +- src/components/mdSelect/mdSelect.scss | 10 ++++++++ src/components/mdSelect/mdSelect.vue | 25 ++++++++++++++++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/mdInputContainer/mdInputContainer.scss b/src/components/mdInputContainer/mdInputContainer.scss index 85ca99d..1a6a16f 100644 --- a/src/components/mdInputContainer/mdInputContainer.scss +++ b/src/components/mdInputContainer/mdInputContainer.scss @@ -193,7 +193,7 @@ $input-size: 32px; } &.md-has-select:hover { - .md-select:after { + .md-select:not(.md-disabled):after { color: rgba(#000, .87); } } diff --git a/src/components/mdSelect/mdSelect.scss b/src/components/mdSelect/mdSelect.scss index 677d0a9..821d1d6 100644 --- a/src/components/mdSelect/mdSelect.scss +++ b/src/components/mdSelect/mdSelect.scss @@ -43,6 +43,16 @@ $select-height: 32px; } } + &.md-disabled { + pointer-events: none; + user-select: none; + user-drag: none; + + &:after { + color: rgba(#000, .38); + } + } + select { position: absolute; left: -999em; diff --git a/src/components/mdSelect/mdSelect.vue b/src/components/mdSelect/mdSelect.vue index 94a8287..78c6f9a 100644 --- a/src/components/mdSelect/mdSelect.vue +++ b/src/components/mdSelect/mdSelect.vue @@ -8,7 +8,7 @@ -
@@ -43,6 +43,8 @@ }, computed: { classes() { + console.log(this.disabled); + return { 'md-disabled': this.disabled }; @@ -58,9 +60,27 @@ watch: { value(value) { this.setTextAndValue(value); + }, + disabled() { + this.setParentDisabled(); + }, + required() { + this.setParentRequired(); + }, + placeholder() { + this.setParentPlaceholder(); } }, methods: { + setParentDisabled() { + this.parentContainer.isDisabled = this.disabled; + }, + setParentRequired() { + this.parentContainer.isRequired = this.required; + }, + setParentPlaceholder() { + this.parentContainer.hasPlaceholder = !!this.placeholder; + }, getSingleValue(value) { let output = {}; @@ -144,6 +164,9 @@ this.setTextAndValue(this.value); if (this.parentContainer) { + this.setParentDisabled(); + this.setParentRequired(); + this.setParentPlaceholder(); this.parentContainer.setValue(this.value); this.parentContainer.hasSelect = true; } From 33af65eb4556c8df10b4e1002bc9b4f65e22f1fa Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 8 Dec 2016 10:12:59 -0200 Subject: [PATCH 11/11] fix tooltip not being removed. fix #156 --- src/components/mdTooltip/mdTooltip.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/mdTooltip/mdTooltip.vue b/src/components/mdTooltip/mdTooltip.vue index 359864b..c42a74f 100644 --- a/src/components/mdTooltip/mdTooltip.vue +++ b/src/components/mdTooltip/mdTooltip.vue @@ -59,11 +59,11 @@ }, methods: { removeTooltips() { - const tooltips = [...document.querySelectorAll('.md-tooltip')]; + const tooltips = [...this.rootElement.querySelectorAll('.md-tooltip')]; tooltips.forEach((tooltip) => { if (tooltip.parentNode) { - this.rootElement.removeChild(tooltip); + tooltip.parentNode.removeChild(tooltip); } });