From 68c02ae766369a9a95858fde9abb275f136b77e6 Mon Sep 17 00:00:00 2001
From: Guillaume Rouxel <hello@guillaumerouxel.fr>
Date: Mon, 24 Oct 2016 22:36:00 +0200
Subject: [PATCH 1/3] add 'type' props to switch button

---
 docs/src/pages/components/Switch.vue | 43 +++++++++++++++++++++++++++-
 src/components/mdSwitch/mdSwitch.vue |  5 ++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/docs/src/pages/components/Switch.vue b/docs/src/pages/components/Switch.vue
index 289775e..b8478e4 100644
--- a/docs/src/pages/components/Switch.vue
+++ b/docs/src/pages/components/Switch.vue
@@ -36,6 +36,16 @@
           <md-switch v-model="checked7" id="my-test7" name="my-test7" class="md-primary" disabled>Light Blue Primary Color Disabled</md-switch>
         </div>
       </demo-example>
+
+      <demo-example label="Typed">
+        <form @click.stop.prevent="submit">
+          <md-switch v-model="checked8" id="my-test8" name="my-test8">Submit (default)</md-switch>
+        </form>
+
+        <div>
+          <md-switch type="button" v-model="checked9" id="my-test9" name="my-test9" class="md-primary">Button</md-switch>
+        </div>
+      </demo-example>
     </div>
 
     <div slot="code">
@@ -67,6 +77,28 @@
 &lt;/div&gt;
         </code-block>
       </demo-example>
+
+      <demo-example label="Typed">
+        <code-block lang="xml">
+&lt;form @click.stop.prevent=&quot;submit&quot;&gt;
+  &lt;md-switch v-model=&quot;checked8&quot; id=&quot;my-test8&quot; name=&quot;my-test8&quot;&gt;Submit (default)&lt;/md-switch&gt;
+&lt;/form&gt;
+
+&lt;div&gt;
+  &lt;md-switch type=&quot;button&quot; v-model=&quot;checked9&quot; id=&quot;my-test9&quot; name=&quot;my-test9&quot; class=&quot;md-primary&quot;&gt;Button&lt;/md-switch&gt;
+&lt;/div&gt;
+        </code-block>
+
+        <code-block lang="javascript">
+export default {
+  methods: {
+    submit(e) {
+      alert('Default switch submits form');
+    }
+  }
+};
+        </code-block>
+      </demo-example>
     </div>
 
     <div slot="api">
@@ -86,8 +118,17 @@
         checked4: true,
         checked5: true,
         checked6: true,
-        checked7: true
+        checked7: true,
+        checked8: true,
+        checked9: true,
+        checked10: true
       };
+    },
+
+    methods: {
+      submit(e) {
+        alert('Default switch submits form');
+      }
     }
   };
 </script>
diff --git a/src/components/mdSwitch/mdSwitch.vue b/src/components/mdSwitch/mdSwitch.vue
index e2188a3..d3c6a46 100644
--- a/src/components/mdSwitch/mdSwitch.vue
+++ b/src/components/mdSwitch/mdSwitch.vue
@@ -3,7 +3,7 @@
     <div class="md-switch-container" @click="toggleSwitch">
       <div class="md-switch-thumb" :style="styles" v-md-ink-ripple="disabled">
         <input type="checkbox" :name="name" :id="id" :disabled="disabled" :value="value">
-        <button class="md-switch-holder"></button>
+        <button :type="type" class="md-switch-holder"></button>
       </div>
     </div>
 
@@ -24,7 +24,8 @@
       name: String,
       value: Boolean,
       id: String,
-      disabled: Boolean
+      disabled: Boolean,
+      type: String
     },
     data() {
       return {

From 25d7d6aea366669c7199f583872f01efb3bbb7a6 Mon Sep 17 00:00:00 2001
From: Guillaume Rouxel <hello@guillaumerouxel.fr>
Date: Tue, 25 Oct 2016 11:47:21 +0200
Subject: [PATCH 2/3] updated docs

---
 docs/src/pages/components/Switch.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/src/pages/components/Switch.vue b/docs/src/pages/components/Switch.vue
index b8478e4..22bfe83 100644
--- a/docs/src/pages/components/Switch.vue
+++ b/docs/src/pages/components/Switch.vue
@@ -38,12 +38,12 @@
       </demo-example>
 
       <demo-example label="Typed">
-        <form @click.stop.prevent="submit">
-          <md-switch v-model="checked8" id="my-test8" name="my-test8">Submit (default)</md-switch>
-        </form>
+        <md-switch v-model="checked8" id="my-test8" name="my-test8">Button (default)</md-switch>
 
         <div>
-          <md-switch type="button" v-model="checked9" id="my-test9" name="my-test9" class="md-primary">Button</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>
         </div>
       </demo-example>
     </div>
@@ -80,20 +80,20 @@
 
       <demo-example label="Typed">
         <code-block lang="xml">
-&lt;form @click.stop.prevent=&quot;submit&quot;&gt;
-  &lt;md-switch v-model=&quot;checked8&quot; id=&quot;my-test8&quot; name=&quot;my-test8&quot;&gt;Submit (default)&lt;/md-switch&gt;
-&lt;/form&gt;
-
 &lt;div&gt;
-  &lt;md-switch type=&quot;button&quot; v-model=&quot;checked9&quot; id=&quot;my-test9&quot; name=&quot;my-test9&quot; class=&quot;md-primary&quot;&gt;Button&lt;/md-switch&gt;
+  &lt;md-switch v-model=&quot;checked8&quot; id=&quot;my-test8&quot; name=&quot;my-test8&quot; class=&quot;md-primary&quot;&gt;Button (default)&lt;/md-switch&gt;
 &lt;/div&gt;
+
+&lt;form @click.stop.prevent=&quot;submit&quot;&gt;
+  &lt;md-switch type=&quot;submit&quot; v-model=&quot;checked9&quot; id=&quot;my-test9&quot; name=&quot;my-test9&quot;&gt;Submit&lt;/md-switch&gt;
+&lt;/form&gt;
         </code-block>
 
         <code-block lang="javascript">
 export default {
   methods: {
     submit(e) {
-      alert('Default switch submits form');
+      alert('This switch submits the form');
     }
   }
 };
@@ -126,8 +126,8 @@ export default {
     },
 
     methods: {
-      submit(e) {
-        alert('Default switch submits form');
+      submit() {
+        alert('This switch submits the form');
       }
     }
   };

From 2c171450af3a796a94277e5cf3136bf79c3f941c Mon Sep 17 00:00:00 2001
From: Guillaume Rouxel <hello@guillaumerouxel.fr>
Date: Tue, 25 Oct 2016 11:48:22 +0200
Subject: [PATCH 3/3] default 'type' value is now 'button'

---
 src/components/mdSwitch/mdSwitch.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/mdSwitch/mdSwitch.vue b/src/components/mdSwitch/mdSwitch.vue
index d3c6a46..549ef50 100644
--- a/src/components/mdSwitch/mdSwitch.vue
+++ b/src/components/mdSwitch/mdSwitch.vue
@@ -25,7 +25,10 @@
       value: Boolean,
       id: String,
       disabled: Boolean,
-      type: String
+      type: {
+        type: String,
+        default: 'button'
+      }
     },
     data() {
       return {