Startseite Erkunden Hilfe
Registrieren Anmelden
GfA
/
novnc
6
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Some CSS style and DOM id/class cleanup.

Joel Martin vor 14 Jahren
Ursprung
7e5f81f255
Commit
608e0f52ee
5 geänderte Dateien mit 18 neuen und 22 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 8 11
      include/base.css
  2. 3 3
      include/display.js
  3. 1 2
      include/ui.js
  4. 1 1
      tests/viewport.html
  5. 5 5
      vnc.html

+ 8 - 11
include/base.css
Datei anzeigen 

@@ -66,17 +66,20 @@ html {
 
 } 
 
 #noVNC_mobile_buttons {
 
+  display: none;
 
+}
 
+
 
+.noVNC-buttons-left {
 
   position:fixed;
 
   padding-left:10px;
 
   padding-top:9px;
 
-  display: none;
 
 }
 
 
-#noVNC_buttons_right {
 
-  position:fixed;
 
+.noVNC-buttons-right {
 
+  float:right;
 
+  right: 0px;
 
   padding-right:10px;
 
   padding-top:9px;
 
-  right:0;
 
 }
 
 
 #noVNC_status_bar {
 
@@ -90,7 +93,7 @@ html {
 
   width:100%;
 
 }
 
 
-.VNC_status_button, #clipboardbutton, #connectbutton {
 
+.noVNC_status_button, #clipboardbutton, #connectbutton {
 
   font-size: 14px;
 
 }
 
 
@@ -112,12 +115,6 @@ html {
 
   float:right;
 
 }
 
 
-.VNC_buttons_right {
 
-  text-align: right;
 
-}
 
-.VNC_buttons_left {
 
-  text-align: left;
 
-}
 
 .noVNC_status_normal {
 
   background: #eee;
 
 }

+ 3 - 3
include/display.js
Datei anzeigen 

@@ -304,10 +304,10 @@ that.viewportChange = function(deltaX, deltaY, width, height) {
 
     }
 
 
     if ((deltaX === 0) && (deltaY === 0)) {
 
-        //message("skipping");
 
+        //Util.Debug("skipping viewport change");
 
         return;
 
     }
 
-    message("deltaX: " + deltaX + ", deltaY: " + deltaY);
 
+    Util.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
 
 
     v.x += deltaX;
 
     vx2 += deltaX;
 
@@ -363,7 +363,7 @@ that.viewportChange = function(deltaX, deltaY, width, height) {
 
         c_ctx.fillRect(0, y1, v.w, h);
 
     }
 
     c_ctx.fillStyle = saveStyle;
 
-}
 
+};
 
 
 that.getCleanDirtyReset = function() {
 
     var v = viewport, c = cleanRect, cleanBox, dirtyBoxes = [],

+ 1 - 2
include/ui.js
Datei anzeigen 

@@ -302,7 +302,7 @@ updateState: function(rfb, state, oldstate, msg) {
 
             c.value = "Disconnect";
 
             c.onclick = UI.disconnect;
 
             c.disabled = false;
 
-            cad.style.display = "block";
 
+            cad.style.display = "";
 
             UI.settingsDisabled(true, rfb);
 
             klass = "noVNC_status_normal";
 
             break;
 
@@ -497,7 +497,6 @@ addOption: function(selectbox,text,value )
 
 setBarPosition: function() {
 
     $D('noVNC-control-bar').style.top = (window.pageYOffset) + 'px';
 
     $D('noVNC_mobile_buttons').style.left = (window.pageXOffset) + 'px';
 
-    $D('noVNC_buttons_right').style.right = 0 + 'px'; 
     
     var vncwidth = $D('noVNC_screen').style.offsetWidth;
 
     $D('noVNC-control-bar').style.width = vncwidth + 'px';

+ 1 - 1
tests/viewport.html
Datei anzeigen 

@@ -86,7 +86,7 @@
 
         }
 
 
         function mouseMove(x, y) {
 
-            var deltaX, deltaY, x1, y1;
 
+            var deltaX, deltaY;
 
 
             if (inMove) {
 
                 //deltaX = x - lastPos.x; // drag viewport

+ 5 - 5
vnc.html
Datei anzeigen 

@@ -48,7 +48,7 @@
 
 <body>
 
     <div id="noVNC-control-bar">
 
         <!--noVNC Mobile Device only Buttons-->
 
-        <div id="noVNC_mobile_buttons"> 
+        <div id="noVNC_mobile_buttons" class="noVNC-buttons-left">
 
             <nobr>
 
                 <span class="noVNC_mouse_buttons">
 
                     <input type="button" class="noVNC_status_button"
 
@@ -68,17 +68,17 @@
 
         </div>
 
 
         <!--noVNC Buttons-->
 
-        <div id="noVNC_buttons_right">
 
+        <div class="noVNC-buttons-right">
 
             <input type="button" class="noVNC_status_button"
 
-                style="float:left;" value="CtrlAltDel" id="sendCtrlAltDelButton"
 
+                value="CtrlAltDel" id="sendCtrlAltDelButton"
 
                 onclick="UI.sendCtrlAltDel();">
 
             <input type="button" id="clipboardbutton" value="Clipboard"
 
                 onclick="UI.showClipboard();"/>
 
-            <input type="button" class="VNC_status_button"
 
+            <input type="button" class="noVNC_status_button"
 
                 value="Settings" id="menuButton"
 
                 onclick="UI.clickSettingsMenu();">
 
             <input type="button" id="connectPanelbutton"
 
-                value="Connection" class="VNC_status_button"
 
+                value="Connection" class="noVNC_status_button"
 
                 onclick="UI.connectPanelbutton()" />
 
         </div>