Explorar el Código

Merge pull request #483 from fabian-z/master

Make noVNC compatible with Content Security Policies
Samuel hace 10 años
padre
commit
8af9b6910c
Se han modificado 3 ficheros con 3 adiciones y 2 borrados
  1. 1 0
      include/base.css
  2. 1 0
      include/ui.js
  3. 1 2
      vnc.html

+ 1 - 0
include/base.css

@@ -238,6 +238,7 @@ html {
   position: relative;
   position: relative;
   left: -40px;
   left: -40px;
   z-index: -1;
   z-index: -1;
+  ime-mode: disabled;
 }
 }
 
 
 /*
 /*

+ 1 - 0
include/ui.js

@@ -185,6 +185,7 @@ var UI;
 
 
             $D("keyboardinput").oninput = UI.keyInput;
             $D("keyboardinput").oninput = UI.keyInput;
             $D("keyboardinput").onblur = UI.keyInputBlur;
             $D("keyboardinput").onblur = UI.keyInputBlur;
+            $D("keyboardinput").onsubmit = function () { return false; };
 
 
             $D("showExtraKeysButton").onclick = UI.showExtraKeys;
             $D("showExtraKeysButton").onclick = UI.showExtraKeys;
             $D("toggleCtrlButton").onclick = UI.toggleCtrl;
             $D("toggleCtrlButton").onclick = UI.toggleCtrl;

+ 1 - 2
vnc.html

@@ -70,8 +70,7 @@
                      style for example -->
                      style for example -->
                 <textarea id="keyboardinput" autocapitalize="off"
                 <textarea id="keyboardinput" autocapitalize="off"
                     autocorrect="off" autocomplete="off" spellcheck="false"
                     autocorrect="off" autocomplete="off" spellcheck="false"
-                    mozactionhint="Enter" onsubmit="return false;"
-                    style="ime-mode: disabled;"></textarea>
+                    mozactionhint="Enter"></textarea>
                 <div id="noVNC_extra_keys">
                 <div id="noVNC_extra_keys">
                     <input type="image" alt="Extra keys" src="images/showextrakeys.png"
                     <input type="image" alt="Extra keys" src="images/showextrakeys.png"
                         id="showExtraKeysButton" class="noVNC_status_button">
                         id="showExtraKeysButton" class="noVNC_status_button">