Changeset 2453 for package_branches/invirt-web/cherrypy

Timestamp:

Aug 21, 2009, 12:13:45 PM (15 years ago)

Author:

ecprice

Message:

Update focus rules to failback in safari

Location:

package_branches/invirt-web/cherrypy/code

Files:

• static/ajaxterm/ajaxterm.js (modified) (1 diff)
• templates/terminal.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy/code/static/ajaxterm/ajaxterm.js

@@ -254 +254 @@
                         opt_paste.attachEvent("onclick", do_paste);
                 }
-                $('term').onkeypress=keypress;
-                $('term').onkeydown=keydown;
+                // If tabIndex works, only grab keyboard events when terminal is focused
+                // Otherwise, grab from whole document (e.g. in Safari).
+                var focus_element = document;
+                if(typeof $('term').tabIndex != "undefined") {
+                    focus_element = $('term');
+                    focus_element.focus();
+                }
+                focus_element.onkeypress=keypress;
+                focus_element.onkeydown=keydown;
                 force=true;
                 timeout=window.setTimeout(update,100);

package_branches/invirt-web/cherrypy/code/templates/terminal.mako

@@ -22 +22 @@
 window.onload=function() {
         t=ajaxterm.Terminal("term", ${machine.machine_id});
-        $('term').focus();
 }
 </script>