| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html manifest="/juju-ui/assets/manifest.appcache"> | 2 <html manifest="/juju-ui/assets/manifest.appcache"> |
| 3 <!-- !IE will be true for all non-IE browsers and IE10 since it does not | 3 <!-- !IE will be true for all non-IE browsers and IE10 since it does not |
| 4 recognize conditional flags. --> | 4 recognize conditional flags. --> |
| 5 <!--[if !IE]><!--><script> | 5 <!--[if !IE]><!--><script> |
| 6 if (/*@cc_on!@*/false) { | 6 if (/*@cc_on!@*/false) { |
| 7 // Only IE10 has cc_on as false. | 7 // Only IE10 has cc_on as false. |
| 8 document.documentElement.className+=' ie10'; | 8 document.documentElement.className+=' ie10'; |
| 9 } | 9 } |
| 10 </script><!--<![endif]--> | 10 </script><!--<![endif]--> |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 // Assemble a socket URL from the Location if one isn't | 240 // Assemble a socket URL from the Location if one isn't |
| 241 // provided. | 241 // provided. |
| 242 var loc = Y.getLocation(); | 242 var loc = Y.getLocation(); |
| 243 var port = juju_config.socket_port || loc.port; | 243 var port = juju_config.socket_port || loc.port; |
| 244 var protocol = juju_config.socket_protocol || 'ws'; | 244 var protocol = juju_config.socket_protocol || 'ws'; |
| 245 juju_config.socket_url = protocol + '://' + loc.hostname; | 245 juju_config.socket_url = protocol + '://' + loc.hostname; |
| 246 if (port) { | 246 if (port) { |
| 247 juju_config.socket_url += ':' + port; | 247 juju_config.socket_url += ':' + port; |
| 248 } | 248 } |
| 249 juju_config.socket_url += '/ws'; | 249 juju_config.socket_url += '/ws'; |
| 250 console.log('websocket url', juju_config.socket_url); | |
| 251 } | 250 } |
| 252 app = new Y.juju.App(juju_config); | 251 app = new Y.juju.App(juju_config); |
| 253 // We need to activate the hotkeys when running the application | 252 // We need to activate the hotkeys when running the application |
| 254 // in production. Unit tests should call it manually. | 253 // in production. Unit tests should call it manually. |
| 255 app.activateHotkeys(); | 254 app.activateHotkeys(); |
| 256 }); | 255 }); |
| 257 }; | 256 }; |
| 258 </script> | 257 </script> |
| 259 </body> | 258 </body> |
| 260 </html> | 259 </html> |
| OLD | NEW |
|---|
