diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html')
| -rw-r--r-- | trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html b/trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html deleted file mode 100644 index 3bdb5c4..0000000 --- a/trunk/infrastructure/net.appjet.ajstdlib/streaming-iframe.html +++ /dev/null @@ -1,76 +0,0 @@ -<html> -<head> -<script> -function createRequestObject() { - var xmlhttp=false; - /*@cc_on @*/ - /*@if (@_jscript_version >= 5) - try { - xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - try { - xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); - } catch (E) { - xmlhttp = false; - } - } - @end @*/ - if (!xmlhttp && typeof XMLHttpRequest!='undefined') { - try { - xmlhttp = new XMLHttpRequest(); - } catch (e) { - xmlhttp=false; - } - } - if (!xmlhttp && window.createRequest) { - try { - xmlhttp = window.createRequest(); - } catch (e) { - xmlhttp=false; - } - } - return xmlhttp -} -var host = window.location.host; -var oldDomain = document.domain; -var newDomain = oldDomain.substring(oldDomain.indexOf(".", oldDomain.indexOf(".")+1)+1); - -function doAction(method, uri, async, headers, body, cb) { - try { - document.domain = oldDomain; - } catch (e) { } - var req = createRequestObject(); - req.open(method, '//'+host+uri, async); - for (var i in headers) { - req.setRequestHeader(i, headers[i]); - } - req.onreadystatechange = function() { - if (req.readyState == 4) { - try { - document.domain = newDomain; - cb(req.status, req.responseText); - } catch (e) { - // yikes. well, hopefully a timeout will notice this error. - } - } - } - req.send(body); -} -function doAbort(xhr) { - try { - document.domain = oldDomain; - } catch (e) { } - xhr.abort(); -} -document.domain = newDomain; -window.onload = function() { - var doneKey = 'done_'+oldDomain.split(".", 2)[0]; - setTimeout(function() { - window.parent[doneKey](); - }, 0); -} -</script> -</head> -<body> -</body> -</html> |