You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by ti...@apache.org on 2015/05/22 18:36:22 UTC
incubator-ripple git commit: RIPPLE-86 Ripple won't launch on IE or
Edge.
Repository: incubator-ripple
Updated Branches:
refs/heads/master 728712ec4 -> b685510fd
RIPPLE-86 Ripple won't launch on IE or Edge.
Switch to use document.URL instead of document.documentURI, which isn't supported by IE or Edge.
Also camera plugin UI is broken - use window.URL if it is available, before falling back on window.webkitURL.
There are still likely some CSS issues (a bunch of webkit specific stuff in there), but this gives us basic support.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/b685510f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/b685510f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/b685510f
Branch: refs/heads/master
Commit: b685510fd719f56bdc9ede46d0b5193c5caf4473
Parents: 728712e
Author: Tim Barham <ti...@microsoft.com>
Authored: Tue May 19 16:44:46 2015 -0700
Committer: Tim Barham <ti...@microsoft.com>
Committed: Tue May 19 16:44:46 2015 -0700
----------------------------------------------------------------------
lib/client/bootstrap.js | 2 +-
lib/client/ui/plugins/camera.js | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/b685510f/lib/client/bootstrap.js
----------------------------------------------------------------------
diff --git a/lib/client/bootstrap.js b/lib/client/bootstrap.js
index 0551508..a574e28 100644
--- a/lib/client/bootstrap.js
+++ b/lib/client/bootstrap.js
@@ -75,7 +75,7 @@ function _bootstrap() {
window.tinyHippos = ripple('index');
tinyHippos.boot(function () {
- var uri = document.documentURI.replace(/enableripple=[^&]*[&]?/i, "").replace(/[\?&]*$/, "");
+ var uri = document.URL.replace(/enableripple=[^&]*[&]?/i, "").replace(/[\?&]*$/, "");
_post(uri);
delete tinyHippos.boot;
});
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/b685510f/lib/client/ui/plugins/camera.js
----------------------------------------------------------------------
diff --git a/lib/client/ui/plugins/camera.js b/lib/client/ui/plugins/camera.js
index 9d8bf33..4bb4c86 100644
--- a/lib/client/ui/plugins/camera.js
+++ b/lib/client/ui/plugins/camera.js
@@ -58,16 +58,14 @@ module.exports = {
capture.setAttribute("controls",true);
capture.style.display = "inline";
capture.style.height = (screen.availHeight - 50) + "px";
- capture.src = window.webkitURL.createObjectURL(upload.files[0]);
+ capture.src = (window.URL || window.webkitURL).createObjectURL(upload.files[0]);
result.appendChild(capture);
-
take.style.display = "inline";
});
take.addEventListener('click', function () {
- //console.log("type", getType());
event.trigger('captured-' + getType(), [result.firstChild.src, upload.files[0]]);
module.exports.hide();
});