Skip to content

Commit 32233d2

Browse files
author
Pablo Henrique
authored
Merge pull request vuematerial#850 from vuematerial/develop
Develop
2 parents aec7f58 + 909c879 commit 32233d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+252
-163
lines changed

‎docs/src/components/ExampleBox.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</md-tabs>
1818
</md-card-area>
1919

20-
<!-- <button type="button" class="md-codepen" @click.native="editOnCodepen">
20+
<!-- <button type="button" class="md-codepen" @click="editOnCodepen">
2121
<img src="assets/codepen.png" alt="Edit on Codepen">
2222
<md-tooltip md-direction="left">Edit on codepen</md-tooltip>
2323
</button> -->

‎docs/src/components/PageContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="page-content">
33
<md-whiteframe md-tag="md-toolbar" md-elevation="1" class="main-header">
4-
<md-button class="md-icon-button nav-trigger" @click.native="toggleSidenav">
4+
<md-button class="md-icon-button nav-trigger" @click="toggleSidenav">
55
<md-icon>menu</md-icon>
66
</md-button>
77

‎docs/src/pages/components/BottomBar.vue

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
<md-table-cell>Receive the item index</md-table-cell>
4747
<md-table-cell>Triggered when an item is activated.</md-table-cell>
4848
</md-table-row>
49+
50+
<md-table-row>
51+
<md-table-cell>click</md-table-cell>
52+
<md-table-cell>Receive the click event</md-table-cell>
53+
<md-table-cell>Triggered when an item is clicked.</md-table-cell>
54+
</md-table-row>
4955
</md-table-body>
5056
</md-table>
5157
</api-table>
@@ -123,7 +129,7 @@
123129
</code-block>
124130
</div>
125131
</example-box>
126-
132+
127133
<example-box card-title="Using SVG">
128134
<div slot="demo">
129135
<div class="phone-viewport">
@@ -145,7 +151,7 @@
145151
</code-block>
146152
</div>
147153
</example-box>
148-
154+
149155
<example-box card-title="Using Iconsets">
150156
<div slot="demo">
151157
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.min.css"/>
@@ -240,10 +246,10 @@
240246
<div slot="demo">
241247
<div class="phone-viewport">
242248
<md-bottom-bar md-shift :md-theme="playground.theme">
243-
<md-bottom-bar-item @click.native="setTheme('blue')" md-icon="ondemand_video">Movies</md-bottom-bar-item>
244-
<md-bottom-bar-item @click.native="setTheme('teal')" md-icon="music_note">Music</md-bottom-bar-item>
245-
<md-bottom-bar-item @click.native="setTheme('brown')" md-icon="books" md-active>Books</md-bottom-bar-item>
246-
<md-bottom-bar-item @click.native="setTheme('indigo')" md-icon="photo">Pictures</md-bottom-bar-item>
249+
<md-bottom-bar-item @click="setTheme('blue')" md-icon="ondemand_video">Movies</md-bottom-bar-item>
250+
<md-bottom-bar-item @click="setTheme('teal')" md-icon="music_note">Music</md-bottom-bar-item>
251+
<md-bottom-bar-item @click="setTheme('brown')" md-icon="books" md-active>Books</md-bottom-bar-item>
252+
<md-bottom-bar-item @click="setTheme('indigo')" md-icon="photo">Pictures</md-bottom-bar-item>
247253
</md-bottom-bar>
248254
</div>
249255
</div>
@@ -252,10 +258,10 @@
252258
<code-block lang="xml">
253259
&lt;md-theme :md-name=&quot;playground.theme&quot;&gt;
254260
&lt;md-bottom-bar md-shift&gt;
255-
&lt;md-bottom-bar-item @click.native=&quot;setTheme(&#039;blue&#039;)&quot; md-icon=&quot;ondemand_video&quot;&gt;Movies&lt;/md-bottom-bar-item&gt;
256-
&lt;md-bottom-bar-item @click.native=&quot;setTheme(&#039;teal&#039;)&quot; md-icon=&quot;music_note&quot;&gt;Music&lt;/md-bottom-bar-item&gt;
257-
&lt;md-bottom-bar-item @click.native=&quot;setTheme(&#039;brown&#039;)&quot; md-icon=&quot;books&quot; md-active&gt;Books&lt;/md-bottom-bar-item&gt;
258-
&lt;md-bottom-bar-item @click.native=&quot;setTheme(&#039;indigo&#039;)&quot; md-icon=&quot;photo&quot;&gt;Pictures&lt;/md-bottom-bar-item&gt;
261+
&lt;md-bottom-bar-item @click=&quot;setTheme(&#039;blue&#039;)&quot; md-icon=&quot;ondemand_video&quot;&gt;Movies&lt;/md-bottom-bar-item&gt;
262+
&lt;md-bottom-bar-item @click=&quot;setTheme(&#039;teal&#039;)&quot; md-icon=&quot;music_note&quot;&gt;Music&lt;/md-bottom-bar-item&gt;
263+
&lt;md-bottom-bar-item @click=&quot;setTheme(&#039;brown&#039;)&quot; md-icon=&quot;books&quot; md-active&gt;Books&lt;/md-bottom-bar-item&gt;
264+
&lt;md-bottom-bar-item @click=&quot;setTheme(&#039;indigo&#039;)&quot; md-icon=&quot;photo&quot;&gt;Pictures&lt;/md-bottom-bar-item&gt;
259265
&lt;/md-bottom-bar&gt;
260266
&lt;/div&gt;
261267
</code-block>

‎docs/src/pages/components/Buttons.vue

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,24 @@
108108
</md-table-row>
109109
</md-table-body>
110110
</md-table>
111+
112+
<md-table slot="events">
113+
<md-table-header>
114+
<md-table-row>
115+
<md-table-head>Name</md-table-head>
116+
<md-table-head>Value</md-table-head>
117+
<md-table-head>Description</md-table-head>
118+
</md-table-row>
119+
</md-table-header>
120+
121+
<md-table-body>
122+
<md-table-row>
123+
<md-table-cell>click</md-table-cell>
124+
<md-table-cell>Receive the click event</md-table-cell>
125+
<md-table-cell>Triggered when an item is clicked.</md-table-cell>
126+
</md-table-row>
127+
</md-table-body>
128+
</md-table>
111129
</api-table>
112130
</div>
113131

‎docs/src/pages/components/Dialog.vue

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@
286286
<md-dialog-content>Nemo, nobis necessitatibus ut illo, ducimus ex.</md-dialog-content>
287287

288288
<md-dialog-actions>
289-
<md-button class="md-primary" @click.native="closeDialog('dialog1')">Cancel</md-button>
290-
<md-button class="md-primary" @click.native="closeDialog('dialog1')">Ok</md-button>
289+
<md-button class="md-primary" @click="closeDialog('dialog1')">Cancel</md-button>
290+
<md-button class="md-primary" @click="closeDialog('dialog1')">Ok</md-button>
291291
</md-dialog-actions>
292292
</md-dialog>
293293

@@ -304,13 +304,13 @@
304304
</md-dialog-content>
305305

306306
<md-dialog-actions>
307-
<md-button class="md-primary" @click.native="closeDialog('dialog2')">Cancel</md-button>
308-
<md-button class="md-primary" @click.native="closeDialog('dialog2')">Create</md-button>
307+
<md-button class="md-primary" @click="closeDialog('dialog2')">Cancel</md-button>
308+
<md-button class="md-primary" @click="closeDialog('dialog2')">Create</md-button>
309309
</md-dialog-actions>
310310
</md-dialog>
311311

312-
<md-button class="md-primary md-raised" id="custom" @click.native="openDialog('dialog1')">Custom</md-button>
313-
<md-button class="md-fab md-fab-bottom-right" id="fab" @click.native="openDialog('dialog2')">
312+
<md-button class="md-primary md-raised" id="custom" @click="openDialog('dialog1')">Custom</md-button>
313+
<md-button class="md-fab md-fab-bottom-right" id="fab" @click="openDialog('dialog2')">
314314
<md-icon>add</md-icon>
315315
</md-button>
316316
</div>
@@ -323,8 +323,8 @@
323323
&lt;md-dialog-content&gt;Nemo, nobis necessitatibus ut illo, ducimus ex.&lt;/md-dialog-content&gt;
324324

325325
&lt;md-dialog-actions&gt;
326-
&lt;md-button class=&quot;md-primary&quot; @click.native=&quot;closeDialog(&apos;dialog1&apos;)&quot;&gt;Cancel&lt;/md-button&gt;
327-
&lt;md-button class=&quot;md-primary&quot; @click.native=&quot;closeDialog(&apos;dialog1&apos;)&quot;&gt;Ok&lt;/md-button&gt;
326+
&lt;md-button class=&quot;md-primary&quot; @click=&quot;closeDialog(&apos;dialog1&apos;)&quot;&gt;Cancel&lt;/md-button&gt;
327+
&lt;md-button class=&quot;md-primary&quot; @click=&quot;closeDialog(&apos;dialog1&apos;)&quot;&gt;Ok&lt;/md-button&gt;
328328
&lt;/md-dialog-actions&gt;
329329
&lt;/md-dialog&gt;
330330

@@ -341,13 +341,13 @@
341341
&lt;/md-dialog-content&gt;
342342

343343
&lt;md-dialog-actions&gt;
344-
&lt;md-button class=&quot;md-primary&quot; @click.native=&quot;closeDialog(&apos;dialog2&apos;)&quot;&gt;Cancel&lt;/md-button&gt;
345-
&lt;md-button class=&quot;md-primary&quot; @click.native=&quot;closeDialog(&apos;dialog2&apos;)&quot;&gt;Create&lt;/md-button&gt;
344+
&lt;md-button class=&quot;md-primary&quot; @click=&quot;closeDialog(&apos;dialog2&apos;)&quot;&gt;Cancel&lt;/md-button&gt;
345+
&lt;md-button class=&quot;md-primary&quot; @click=&quot;closeDialog(&apos;dialog2&apos;)&quot;&gt;Create&lt;/md-button&gt;
346346
&lt;/md-dialog-actions&gt;
347347
&lt;/md-dialog&gt;
348348

349-
&lt;md-button class=&quot;md-primary md-raised&quot; id=&quot;custom&quot; @click.native=&quot;openDialog(&apos;dialog1&apos;)&quot;&gt;Custom&lt;/md-button&gt;
350-
&lt;md-button class=&quot;md-fab md-fab-bottom-right&quot; id=&quot;fab&quot; @click.native=&quot;openDialog(&apos;dialog2&apos;)&quot;&gt;
349+
&lt;md-button class=&quot;md-primary md-raised&quot; id=&quot;custom&quot; @click=&quot;openDialog(&apos;dialog1&apos;)&quot;&gt;Custom&lt;/md-button&gt;
350+
&lt;md-button class=&quot;md-fab md-fab-bottom-right&quot; id=&quot;fab&quot; @click=&quot;openDialog(&apos;dialog2&apos;)&quot;&gt;
351351
&lt;md-icon&gt;add&lt;/md-icon&gt;
352352
&lt;/md-button&gt;
353353
</code-block>
@@ -391,8 +391,8 @@
391391
ref="dialog4">
392392
</md-dialog-alert>
393393

394-
<md-button class="md-primary md-raised" @click.native="openDialog('dialog3')">Alert</md-button>
395-
<md-button class="md-primary md-raised" @click.native="openDialog('dialog4')">Alert with HTML</md-button>
394+
<md-button class="md-primary md-raised" @click="openDialog('dialog3')">Alert</md-button>
395+
<md-button class="md-primary md-raised" @click="openDialog('dialog4')">Alert with HTML</md-button>
396396
</div>
397397

398398
<div slot="code">
@@ -413,8 +413,8 @@
413413
ref=&quot;dialog4&quot;&gt;
414414
&lt;/md-dialog-alert&gt;
415415

416-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;openDialog(&apos;dialog3&apos;)&quot;&gt;Alert&lt;/md-button&gt;
417-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;openDialog(&apos;dialog4&apos;)&quot;&gt;Alert with HTML&lt;/md-button&gt;
416+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;openDialog(&apos;dialog3&apos;)&quot;&gt;Alert&lt;/md-button&gt;
417+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;openDialog(&apos;dialog4&apos;)&quot;&gt;Alert with HTML&lt;/md-button&gt;
418418
</code-block>
419419

420420
<code-block lang="javascript">
@@ -460,7 +460,7 @@
460460
ref="dialog5">
461461
</md-dialog-confirm>
462462

463-
<md-button class="md-primary md-raised" @click.native="openDialog('dialog5')">Confirm</md-button>
463+
<md-button class="md-primary md-raised" @click="openDialog('dialog5')">Confirm</md-button>
464464
</div>
465465

466466
<div slot="code">
@@ -475,7 +475,7 @@
475475
ref=&quot;dialog5&quot;&gt;
476476
&lt;/md-dialog-confirm&gt;
477477

478-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;openDialog(&apos;dialog5&apos;)&quot;&gt;Confirm&lt;/md-button&gt;
478+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;openDialog(&apos;dialog5&apos;)&quot;&gt;Confirm&lt;/md-button&gt;
479479
</code-block>
480480

481481
<code-block lang="javascript">
@@ -523,7 +523,7 @@
523523
ref="dialog6">
524524
</md-dialog-prompt>
525525

526-
<md-button class="md-primary md-raised" @click.native="openDialog('dialog6')">Prompt</md-button>
526+
<md-button class="md-primary md-raised" @click="openDialog('dialog6')">Prompt</md-button>
527527
</div>
528528

529529
<div slot="code">
@@ -538,7 +538,7 @@
538538
ref=&quot;dialog6&quot;&gt;
539539
&lt;/md-dialog-prompt&gt;
540540

541-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;openDialog(&apos;dialog6&apos;)&quot;&gt;Prompt&lt;/md-button&gt;
541+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;openDialog(&apos;dialog6&apos;)&quot;&gt;Prompt&lt;/md-button&gt;
542542
</code-block>
543543

544544
<code-block lang="javascript">

‎docs/src/pages/components/ImageLoader.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<div slot="example">
3131
<example-box card-title="Default">
3232
<div slot="demo">
33-
<md-button class="md-primary md-raised" @click.native="loadImage">Load Image</md-button>
34-
<md-button class="md-primary md-raised" @click.native="clearImage">Clear Image</md-button>
33+
<md-button class="md-primary md-raised" @click="loadImage">Load Image</md-button>
34+
<md-button class="md-primary md-raised" @click="clearImage">Clear Image</md-button>
3535

3636
<div>
3737
<md-image :md-src="src"></md-image>
@@ -40,8 +40,8 @@
4040

4141
<div slot="code">
4242
<code-block lang="xml">
43-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;loadImage&quot;&gt;Load Image&lt;/md-button&gt;
44-
&lt;md-button class=&quot;md-primary md-raised&quot; @click.native=&quot;clearImage&quot;&gt;Clear Image&lt;/md-button&gt;
43+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;loadImage&quot;&gt;Load Image&lt;/md-button&gt;
44+
&lt;md-button class=&quot;md-primary md-raised&quot; @click=&quot;clearImage&quot;&gt;Clear Image&lt;/md-button&gt;
4545

4646
&lt;div&gt;
4747
&lt;md-image :md-src=&quot;src&quot;&gt;&lt;/md-image&gt;

‎docs/src/pages/components/List.vue

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<md-table-cell><code>Boolean</code></md-table-cell>
7171
<md-table-cell>Disable the item and prevent its actions. Default <code>false</code></md-table-cell>
7272
</md-table-row>
73-
</md-table-row>
7473

7574
<md-table-row>
7675
<md-table-cell>md-expand-multiple</md-table-cell>
@@ -95,6 +94,24 @@
9594
</md-table-row>
9695
</md-table-body>
9796
</md-table>
97+
98+
<md-table slot="events">
99+
<md-table-header>
100+
<md-table-row>
101+
<md-table-head>Name</md-table-head>
102+
<md-table-head>Value</md-table-head>
103+
<md-table-head>Description</md-table-head>
104+
</md-table-row>
105+
</md-table-header>
106+
107+
<md-table-body>
108+
<md-table-row>
109+
<md-table-cell>click</md-table-cell>
110+
<md-table-cell>Receive the click event</md-table-cell>
111+
<md-table-cell>Triggered when an item is clicked.</md-table-cell>
112+
</md-table-row>
113+
</md-table-body>
114+
</md-table>
98115
</api-table>
99116

100117
<api-table name="md-list-expand">
@@ -858,7 +875,7 @@
858875
<md-list>
859876
<md-list-item>Plain Text</md-list-item>
860877
<md-list-item target="_blank" href="https://google.com">Link</md-list-item>
861-
<md-list-item @click.native="openAlert">Button</md-list-item>
878+
<md-list-item @click="openAlert">Button</md-list-item>
862879
<md-list-item>
863880
<router-link to="/components/list">Router View</router-link>
864881
</md-list-item>
@@ -876,7 +893,7 @@
876893
&lt;md-list&gt;
877894
&lt;md-list-item&gt;Plain Text&lt;/md-list-item&gt;
878895
&lt;md-list-item target=&quot;_blank&quot; href=&quot;https://google.com&quot;&gt;Link&lt;/md-list-item&gt;
879-
&lt;md-list-item @click.native=&quot;openAlert&quot;&gt;Button&lt;/md-list-item&gt;
896+
&lt;md-list-item @click=&quot;openAlert&quot;&gt;Button&lt;/md-list-item&gt;
880897
&lt;md-list-item&gt;
881898
&lt;router-link to=&quot;/components/list&quot;&gt;Router View&lt;/router-link&gt;
882899
&lt;/md-list-item&gt;
@@ -1001,7 +1018,7 @@
10011018
&lt;md-list&gt;
10021019
&lt;md-list-item&gt;Plain Text&lt;/md-list-item&gt;
10031020
&lt;md-list-item target="_blank" href="https://google.com"&gt;Link&lt;/md-list-item&gt;
1004-
&lt;md-list-item @click.native="openAlert"&gt;Button&lt;/md-list-item&gt;
1021+
&lt;md-list-item @click="openAlert"&gt;Button&lt;/md-list-item&gt;
10051022
&lt;md-list-item&gt;
10061023
&lt;router-link to="/components/list"&gt;Router View&lt;/router-link&gt;
10071024
&lt;/md-list-item&gt;

‎docs/src/pages/components/Menu.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
<md-table-cell>None</md-table-cell>
7979
<md-table-cell>Triggered when the menu starts to close.</md-table-cell>
8080
</md-table-row>
81+
82+
<md-table-row>
83+
<md-table-cell>click</md-table-cell>
84+
<md-table-cell>Receive the click event</md-table-cell>
85+
<md-table-cell>Triggered when an item is clicked.</md-table-cell>
86+
</md-table-row>
8187
</md-table-body>
8288
</md-table>
8389

@@ -523,7 +529,7 @@
523529
</md-menu-content>
524530
</md-menu>
525531

526-
<md-button class="md-raised md-primary" @click.native="$refs.menu.open">Open contact card</md-button>
532+
<md-button class="md-raised md-primary" @click="$refs.menu.open">Open contact card</md-button>
527533
</div>
528534

529535
<div slot="code">
@@ -591,7 +597,7 @@
591597
&lt;/md-menu-content&gt;
592598
&lt;/md-menu&gt;
593599

594-
&lt;md-button class=&quot;md-raised md-primary&quot; @click.native=&quot;$refs.menu.open&quot;&gt;Open contact card&lt;/md-button&gt;
600+
&lt;md-button class=&quot;md-raised md-primary&quot; @click=&quot;$refs.menu.open&quot;&gt;Open contact card&lt;/md-button&gt;
595601
</code-block>
596602

597603
<code-block lang="sass">

‎docs/src/pages/components/Progress.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<md-progress class="md-warn" :md-progress="progress" v-if="transition"></md-progress>
4848
</div>
4949

50-
<md-button class="md-primary md-raised" @click.native="restartProgress">Restart</md-button>
50+
<md-button class="md-primary md-raised" @click="restartProgress">Restart</md-button>
5151
</div>
5252

5353
<div slot="code">

‎docs/src/pages/components/Select.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
</md-input-container>
210210
</div>
211211

212-
<md-button class="md-raised md-primary" @click.native="setPulpFiction">Set Pulp Fiction</md-button>
212+
<md-button class="md-raised md-primary" @click="setPulpFiction">Set Pulp Fiction</md-button>
213213
</div>
214214

215215
<div slot="code">
@@ -279,7 +279,7 @@
279279
&lt;/md-input-container&gt;
280280
&lt;/div&gt;
281281

282-
&lt;md-button class=&quot;md-raised md-primary&quot; @click.native=&quot;setPulpFiction&quot;&gt;Set Pulp Fiction&lt;/md-button&gt;
282+
&lt;md-button class=&quot;md-raised md-primary&quot; @click=&quot;setPulpFiction&quot;&gt;Set Pulp Fiction&lt;/md-button&gt;
283283
</code-block>
284284

285285
<code-block lang="javascript">
@@ -322,7 +322,7 @@
322322
<div>Selected letters: {{ items }}</div>
323323
<br/>
324324
<br/>
325-
325+
326326
<div class="field-group">
327327
<md-input-container>
328328
<label for="users">Multiselect with subheaders</label>
@@ -347,7 +347,7 @@
347347
</md-select>
348348
</md-input-container>
349349
</div>
350-
350+
351351
<div>Selected users: {{ users }}</div>
352352

353353
</div>
@@ -365,9 +365,9 @@
365365
&lt;md-select&gt;
366366
&lt;/md-input-container&gt;
367367

368-
&lt;div&gt;Selected letters: {{ items }}&lt;/div&gt;
369-
370-
368+
&lt;div&gt;Selected letters: {{ items }}&lt;/div&gt;
369+
370+
371371
&lt;md-input-container&gt;
372372
&lt;label for=&quot;users&quot;&gt;Users&lt;/label&gt;
373373
&lt;md-select name=&quot;users&quot; id=&quot;users&quot; multiple v-model=&quot;users&quot;&gt;

0 commit comments

Comments
 (0)