From 2cc76c3af7760ab1a871f638963c3e3c8939ddf7 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 29 Jul 2015 14:35:07 +0200
Subject: [PATCH] Type attribute on data forms is mandatory. updates #306

See here:
https://github.com/strophe/strophejs-plugins/pull/65
---
 converse.js |  4 ++--
 spec/mam.js | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/converse.js b/converse.js
index 742cc415d..221bbd9b1 100644
--- a/converse.js
+++ b/converse.js
@@ -6331,8 +6331,8 @@
                 }
                 var stanza = $iq(attrs).c('query', {'xmlns':Strophe.NS.MAM, 'queryid':queryid});
                 if (typeof options != "undefined") {
-                    stanza.c('x', {'xmlns':Strophe.NS.XFORM})
-                            .c('field', {'var':'FORM_TYPE'})
+                    stanza.c('x', {'xmlns':Strophe.NS.XFORM, 'type': 'submit'})
+                            .c('field', {'var':'FORM_TYPE', 'type': 'hidden'})
                             .c('value').t(Strophe.NS.MAM).up().up();
 
                     if (options['with'] && !options.groupchat) {
diff --git a/spec/mam.js b/spec/mam.js
index 8ac6d9315..f04b1e2e4 100644
--- a/spec/mam.js
+++ b/spec/mam.js
@@ -52,8 +52,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                            "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                            "<field var='FORM_TYPE' type='hidden'>"+
                                 "<value>urn:xmpp:mam:0</value>"+
                             "</field>"+
                             "<field var='with'>"+
@@ -86,8 +86,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                            "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                            "<field var='FORM_TYPE' type='hidden'>"+
                                 "<value>urn:xmpp:mam:0</value>"+
                             "</field>"+
                             "<field var='start'>"+
@@ -124,8 +124,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                            "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                            "<field var='FORM_TYPE' type='hidden'>"+
                                 "<value>urn:xmpp:mam:0</value>"+
                             "</field>"+
                             "<field var='start'>"+
@@ -153,8 +153,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                                "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                                "<field var='FORM_TYPE' type='hidden'>"+
                                     "<value>urn:xmpp:mam:0</value>"+
                                 "</field>"+
                                 "<field var='start'>"+
@@ -189,8 +189,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                                "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                                "<field var='FORM_TYPE' type='hidden'>"+
                                     "<value>urn:xmpp:mam:0</value>"+
                                 "</field>"+
                                 "<field var='start'>"+
@@ -221,8 +221,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                                "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                                "<field var='FORM_TYPE' type='hidden'>"+
                                     "<value>urn:xmpp:mam:0</value>"+
                                 "</field>"+
                             "</x>"+
@@ -258,8 +258,8 @@
                 expect(sent_stanza.toString()).toBe(
                     "<iq type='set' xmlns='jabber:client' id='"+IQ_id+"'>"+
                         "<query xmlns='urn:xmpp:mam:0' queryid='"+queryid+"'>"+
-                            "<x xmlns='jabber:x:data'>"+
-                                "<field var='FORM_TYPE'>"+
+                            "<x xmlns='jabber:x:data' type='submit'>"+
+                                "<field var='FORM_TYPE' type='hidden'>"+
                                     "<value>urn:xmpp:mam:0</value>"+
                                 "</field>"+
                                 "<field var='with'>"+