[ARVADOS] updated: 6929750b2f8f1f0b01b40f0ac516ec5f9e431c4d

git at public.curoverse.com git at public.curoverse.com
Fri Jul 10 11:49:54 EDT 2015


Summary of changes:
 apps/workbench/public/{ => webshell}/enabled.gif   | Bin
 apps/workbench/public/{ => webshell}/keyboard.html |   0
 apps/workbench/public/{ => webshell}/keyboard.png  | Bin
 apps/workbench/public/webshell/shell_in_a_box.js   |  18 ++++++++----------
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename apps/workbench/public/{ => webshell}/enabled.gif (100%)
 rename apps/workbench/public/{ => webshell}/keyboard.html (100%)
 rename apps/workbench/public/{ => webshell}/keyboard.png (100%)

       via  6929750b2f8f1f0b01b40f0ac516ec5f9e431c4d (commit)
       via  264391e43f3fa3a73c1c274dd9970963e68b8ace (commit)
      from  eb4fb5479e86795128e71ebd1bb478b50ff6d7c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6929750b2f8f1f0b01b40f0ac516ec5f9e431c4d
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 10 11:18:46 2015 -0400

    6279: Do not set content-length headers in XHR.
    
    According to error messages in Chrome console:
    
    Refused to set unsafe header "Content-Length"
      ShellInABox.sendRequest @ shell_in_a_box.js:178
      ShellInABox.onReadyStateChange @ shell_in_a_box.js:206
      (anonymous function) @ shell_in_a_box.js:183

diff --git a/apps/workbench/public/webshell/shell_in_a_box.js b/apps/workbench/public/webshell/shell_in_a_box.js
index 448bfda..6fdf10d 100644
--- a/apps/workbench/public/webshell/shell_in_a_box.js
+++ b/apps/workbench/public/webshell/shell_in_a_box.js
@@ -175,7 +175,6 @@ ShellInABox.prototype.sendRequest = function(request) {
                                (this.session ? '&session=' +
                                 encodeURIComponent(this.session) : '&rooturl='+
                                 encodeURIComponent(this.rooturl));
-  request.setRequestHeader('Content-Length', content.length);
 
   request.onreadystatechange = function(shellInABox) {
     return function() {
@@ -233,7 +232,6 @@ ShellInABox.prototype.sendKeys = function(keys) {
                                  '&height=' + this.terminalHeight +
                                  '&session=' +encodeURIComponent(this.session)+
                                  '&keys=' + encodeURIComponent(keys);
-    request.setRequestHeader('Content-Length', content.length);
     request.onreadystatechange = function(shellInABox) {
       return function() {
                try {

commit 264391e43f3fa3a73c1c274dd9970963e68b8ace
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 10 11:16:43 2015 -0400

    6279: Move keyboard assets to /public/webshell/

diff --git a/apps/workbench/public/enabled.gif b/apps/workbench/public/webshell/enabled.gif
similarity index 100%
rename from apps/workbench/public/enabled.gif
rename to apps/workbench/public/webshell/enabled.gif
diff --git a/apps/workbench/public/keyboard.html b/apps/workbench/public/webshell/keyboard.html
similarity index 100%
rename from apps/workbench/public/keyboard.html
rename to apps/workbench/public/webshell/keyboard.html
diff --git a/apps/workbench/public/keyboard.png b/apps/workbench/public/webshell/keyboard.png
similarity index 100%
rename from apps/workbench/public/keyboard.png
rename to apps/workbench/public/webshell/keyboard.png
diff --git a/apps/workbench/public/webshell/shell_in_a_box.js b/apps/workbench/public/webshell/shell_in_a_box.js
index 115cc74..448bfda 100644
--- a/apps/workbench/public/webshell/shell_in_a_box.js
+++ b/apps/workbench/public/webshell/shell_in_a_box.js
@@ -800,7 +800,7 @@ VT100.prototype.initializeUserCSSStyles = function() {
                           sheet.disabled = false;
                         }
                         if (!sheet.disabled) {
-                          label.innerHTML= '<img src="enabled.gif" />' +
+                          label.innerHTML= '<img src="/webshell/enabled.gif" />' +
                                            label.innerHTML;
                         }
                       } else {
@@ -839,7 +839,7 @@ VT100.prototype.initializeUserCSSStyles = function() {
       // both ends), or whether this is a on/off toggle, which can be grouped
       // together with other on/off options.
       group                             +=
-        '<li>' + (enabled ? '<img src="enabled.gif" />' : '') +
+        '<li>' + (enabled ? '<img src="/webshell/enabled.gif" />' : '') +
                  label +
         '</li>';
     }
@@ -1249,7 +1249,7 @@ VT100.prototype.initializeElements = function(container) {
                        '<div id="scrollable">' +
                          '<table id="kbd_button">' +
                            '<tr><td width="100%"> </td>' +
-                           '<td><img id="kbd_img" src="keyboard.png" /></td>' +
+                           '<td><img id="kbd_img" src="/webshell/keyboard.png" /></td>' +
                            '<td>    </td></tr>' +
                          '</table>' +
                          '<pre id="lineheight"> </pre>' +
@@ -1269,7 +1269,7 @@ VT100.prototype.initializeElements = function(container) {
                          (typeof suppressAllAudio != 'undefined' &&
                           suppressAllAudio ? "" :
                          embed + '<bgsound id="beep_bgsound" loop=1 />') +
-                          '<iframe id="layout" src="keyboard.html" />' +
+                          '<iframe id="layout" src="/webshell/keyboard.html" />' +
                         '</div>';
   }
 
@@ -2840,16 +2840,16 @@ VT100.prototype.showContextMenu = function(x, y) {
           '<li id="reset">Reset</li>' +
           '<hr />' +
           '<li id="beginconfig">' +
-             (this.utfEnabled ? '<img src="enabled.gif" />' : '') +
+             (this.utfEnabled ? '<img src="/webshell/enabled.gif" />' : '') +
              'Unicode</li>' +
           '<li>' +
-             (this.visualBell ? '<img src="enabled.gif" />' : '') +
+             (this.visualBell ? '<img src="/webshell/enabled.gif" />' : '') +
              'Visual Bell</li>'+
           '<li>' +
-             (this.softKeyboard ? '<img src="enabled.gif" />' : '') +
+             (this.softKeyboard ? '<img src="/webshell/enabled.gif" />' : '') +
              'Onscreen Keyboard</li>' +
           '<li id="endconfig">' +
-             (this.blinkingCursor ? '<img src="enabled.gif" />' : '') +
+             (this.blinkingCursor ? '<img src="/webshell/enabled.gif" />' : '') +
              'Blinking Cursor</li>'+
           (this.usercss.firstChild ?
            '<hr id="beginusercss" />' +

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list