]> git.proxmox.com Git - mirror_novnc.git/commitdiff
projects / mirror_novnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e5f81f)
Some CSS style and DOM id/class cleanup.
authorJoel Martin <github@martintribe.org>
Wed, 14 Sep 2011 14:24:30 +0000 (09:24 -0500)
committerJoel Martin <github@martintribe.org>
Wed, 14 Sep 2011 14:24:30 +0000 (09:24 -0500)
include/base.css patch | blob | blame | history
include/display.js patch | blob | blame | history
include/ui.js patch | blob | blame | history
tests/viewport.html patch | blob | blame | history
vnc.html patch | blob | blame | history

diff --git a/include/base.css b/include/base.css
index b3c76a0621bef47b3233d3b016dbe1e9ba48613e..172b0e8da84e67baa765f70d05d208552059bb81 100644 (file)
--- a/include/base.css
+++ b/include/base.css
@@ -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;
 }
diff --git a/include/display.js b/include/display.js
index 4f37cd149dc72343bd94e9521d1be8fbe8c94df6..cd228580a668c802dd5eff883430a4635cafe282 100644 (file)
--- a/include/display.js
+++ b/include/display.js
@@ -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 = [],
diff --git a/include/ui.js b/include/ui.js
index 17afe8b3eb64d6c347dafe9480658751bc032e48..fa41854c5a356bfe1dd9dc9532e5fa8f2436f847 100644 (file)
--- a/include/ui.js
+++ b/include/ui.js
@@ -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';
diff --git a/tests/viewport.html b/tests/viewport.html
index 9dcb53f1a684cfd3f13ec546fe4cd60ae64c20dd..fbbf286d053e8943fe229920008291c8cff73ed4 100644 (file)
--- a/tests/viewport.html
+++ b/tests/viewport.html
@@ -86,7 +86,7 @@
         }
 
         function mouseMove(x, y) {
-            var deltaX, deltaY, x1, y1;
+            var deltaX, deltaY;
 
             if (inMove) {
                 //deltaX = x - lastPos.x; // drag viewport
diff --git a/vnc.html b/vnc.html
index c3fe5ddb13003632d780eafe40d93182168992df..f7159c602449ec39ffcd64134b38adddb5807d5a 100644 (file)
--- a/vnc.html
+++ b/vnc.html
@@ -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>
 
noVNC mirror