]> git.openstreetmap.org Git - osqa.git/commitdiff
fixed up some english and changed markdown default editor to show markdown instead...
authormatt <matt@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Fri, 20 Aug 2010 20:02:23 +0000 (20:02 +0000)
committermatt <matt@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Fri, 20 Aug 2010 20:02:23 +0000 (20:02 +0000)
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@564 0cfe37f9-358a-4d5e-be75-b63607b5c754

forum/skins/default/media/js/osqa.main.js
forum/skins/default/media/js/wmd/wmd.js

index 487b1dbe0a0a8ea152aa67cb1f3e71deabd15e9c..34d13b3c84ac8af68b6dda9ca1bb0921c44fda0d 100644 (file)
@@ -1058,13 +1058,13 @@ $(document).ready( function(){
 \r
 function yourWorkWillBeLost(e) {\r
     if(browserTester('chrome')) {\r
 \r
 function yourWorkWillBeLost(e) {\r
     if(browserTester('chrome')) {\r
-        return "You sure you want to leave?  Your work will be lost.";\r
+        return "Are you sure you want to leave?  Your work will be lost.";\r
     } else if(browserTester('safari')) {\r
     } else if(browserTester('safari')) {\r
-        return "You sure you want to leave?  Your work will be lost.";\r
+        return "Are you sure you want to leave?  Your work will be lost.";\r
     } else {\r
         if(!e) e = window.event;\r
         e.cancelBubble = true;\r
     } else {\r
         if(!e) e = window.event;\r
         e.cancelBubble = true;\r
-        e.returnValue = 'If you leave your work will be lost.';\r
+        e.returnValue = 'If you leave, your work will be lost.';\r
 \r
         if (e.stopPropagation) {\r
             e.stopPropagation();\r
 \r
         if (e.stopPropagation) {\r
             e.stopPropagation();\r
@@ -1075,6 +1075,5 @@ function yourWorkWillBeLost(e) {
 }\r
 \r
 function browserTester(browserString) {\r
 }\r
 \r
 function browserTester(browserString) {\r
-    var test = navigator.userAgent;\r
     return navigator.userAgent.toLowerCase().indexOf(browserString) > -1;\r
 }
\ No newline at end of file
     return navigator.userAgent.toLowerCase().indexOf(browserString) > -1;\r
 }
\ No newline at end of file
index 5b859767bcb299d7aea0a3ebd2aaead5f72b83bd..5f62eca4e469df87d13ca5383d4a7d208b50c85c 100644 (file)
@@ -1097,6 +1097,14 @@ Attacklab.wmdBase = function(){
                                        var keyCode = key.charCode || key.keyCode;
                                        var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
                                        
                                        var keyCode = key.charCode || key.keyCode;
                                        var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
                                        
+                                       // Bugfix for messed up DEL and .
+                                       if (keyCode === 46) {
+                                               keyCodeStr = "";
+                                       }
+                                       if (keyCode === 190) {
+                                               keyCodeStr = ".";
+                                       }
+
                                        switch(keyCodeStr) {
                                                case "b":
                                                        doClick(document.getElementById("wmd-bold-button"));
                                        switch(keyCodeStr) {
                                                case "b":
                                                        doClick(document.getElementById("wmd-bold-button"));
@@ -1266,7 +1274,7 @@ Attacklab.wmdBase = function(){
                                this.text = inputArea.value;
                        }
                        
                                this.text = inputArea.value;
                        }
                        
-               }
+               };
                
                // Sets the selected text in the input box after we've performed an
                // operation.
                
                // Sets the selected text in the input box after we've performed an
                // operation.
@@ -2323,7 +2331,7 @@ Attacklab.wmdBase = function(){
 
 Attacklab.wmd_env = {};
 Attacklab.account_options = {};
 
 Attacklab.wmd_env = {};
 Attacklab.account_options = {};
-Attacklab.wmd_defaults = {version:1, output:"HTML", lineLength:40, delayLoad:false};
+Attacklab.wmd_defaults = {version:1, output:"Markdown", lineLength:40, delayLoad:false};
 
 if(!Attacklab.wmd)
 {
 
 if(!Attacklab.wmd)
 {