Jira OSQA-490 Banner placeholders.

[osqa.git] / forum / skins / default / templates / answer_edit.html

diff --git a/forum/skins/default/templates/answer_edit.html b/forum/skins/default/templates/answer_edit.html
index d7423af6c60e21f38cefc523ffd7c922716d63bb..c9d846626eb4a94bdfc2e044bd34b0e41a350faf 100644 (file)
--- a/forum/skins/default/templates/answer_edit.html
+++ b/forum/skins/default/templates/answer_edit.html
@@ -35,30 +35,25 @@
         });
 
 
         });
 
 

-        function submitClicked(e) {
-            if(!is_chrome) {
+        function submitClicked(e, f) {
+            if(!(browserTester('chrome') || browserTester('safari'))) {

                 $("input.submit")[0].disabled=true;
                 $("input.submit")[1].disabled=true;
             }
             window.removeEventListener('beforeunload', beforeUnload, true);
                 $("input.submit")[0].disabled=true;
                 $("input.submit")[1].disabled=true;
             }
             window.removeEventListener('beforeunload', beforeUnload, true);

+            if (f) {
+                f.submit();
+            }

         }
 
         function beforeUnload(e) {
         }
 
         function beforeUnload(e) {

-            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;

             if($("textarea#editor")[0].value != answer) {
             if($("textarea#editor")[0].value != answer) {

-                 if(is_chrome) {
-                     return "You sure you want to leave?  Your work will be lost.";
-                 } else {
-                     yourWorkWillBeLost(e);
-                 }
-                 return false;
+                 return yourWorkWillBeLost(e);

             }
         }
         window.addEventListener('beforeunload', beforeUnload, true);
 
             }
         }
         window.addEventListener('beforeunload', beforeUnload, true);
 

-

         var answer = "";
         var answer = "";

-        var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;

         </script>
 {% endblock %}
         
         </script>
 {% endblock %}
         


@@ -80,6 +75,7 @@
                 <span class="form-error"></span>
                 <div class="preview-toggle"><span id="pre-collapse" 
                                        title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                 <span class="form-error"></span>
                 <div class="preview-toggle"><span id="pre-collapse" 
                                        title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>

+                           <span style="text-align: right; margin-left: 200px;" id="editor-metrics"></span>

                                {% if settings.WIKI_ON %}
                     <div style="float:right;">
                         {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                                {% if settings.WIKI_ON %}
                     <div style="float:right;">
                         {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>


@@ -94,8 +90,8 @@
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>

-            <input type="submit" value="{% trans "Save edit" %}" class="submit" onclick="submitClicked(event)" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);submitClicked(event)" />
+            <input type="button" value="{% trans "Save edit" %}" class="submit" onclick="submitClicked(event, this.form)" />
+            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="submitClicked(event, this.form);history.back(-1);" />

         </form>
     </div>
 </div>
         </form>
     </div>
 </div>