Merge pull request #6437 from ochameau/csp-ftu

Bug 796739: [ftu] fix CSP violation r=fcampo
mozilla-b2g · Nov 29, 2012 · 4f5f66d · 4f5f66d
2 parents a557af6 + 665165f
commit 4f5f66d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/apps/communications/ftu/index.html b/apps/communications/ftu/index.html
@@ -134,10 +134,10 @@ <h2 id="time-zone-title">
             GMT +00:00 Greenwich Mean Time
           </h2>
         </section>
-        <form data-type="list" onsubmit="return false;">
+        <form id="time-form" data-type="list">
           <ul>
             <li>
-              <button class="change icon icon-dialog" data-l10n-id="change">
+              <button class="change icon icon-dialog" data-l10n-id="change" type="button">
                 Change
               </button>
               <p id="timezone-configuration-label">GMT +00:00</p>
@@ -166,14 +166,14 @@ <h2 id="time-zone-title">
                </select>
             </li>
             <li>
-              <button class="change icon icon-dialog" data-l10n-id="change">
+              <button class="change icon icon-dialog" data-l10n-id="change" type="button">
                 Change
               </button>
               <p id="date-configuration-label"></p>
               <input id="date-configuration" class="invisible" type="date"></input>
             </li>
             <li>
-              <button class="change icon icon-dialog" data-l10n-id="change">
+              <button class="change icon icon-dialog" data-l10n-id="change" type="button">
                 Change
               </button>
               <p id="time-configuration-label">00:00</p>

diff --git a/apps/communications/ftu/js/ui.js b/apps/communications/ftu/js/ui.js
@@ -100,6 +100,10 @@ var UIManager = {
     delete this.buttonSkip;
     return this.buttonSkip = document.getElementById('skip');
   },
+  get timeForm() {
+    delete this.timeForm;
+    return this.timeForm = document.getElementById('time-form');
+  },
   init: function ui_init() {
     var currentDate = new Date();
     var f = new navigator.mozL10n.DateTimeFormat();
@@ -127,6 +131,10 @@ var UIManager = {
       Tutorial.init();
     });
     this.fakeSimPin.addEventListener('input', this);
+    // Prevent form submit in case something try to send it
+    this.timeForm.addEventListener('submit', function (event) {
+      event.preventDefault();
+    });
   },
   handleEvent: function ui_handleEvent(event) {
     switch (event.target.id) {