summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@theqtcompany.com>2016-02-11 20:58:05 +0100
committerMorten Johan Sørvig <morten.sorvig@theqtcompany.com>2016-02-12 23:04:51 +0000
commit9218b74df738da1b6e8c304641656957d152b501 (patch)
treec12f0e9b0abff046087ec698324bdcae7dbc6592
parentd20da0ef6da9311185edc1b855343cba442dc3db (diff)
Display error message on non-Chrome
Change-Id: Ie2c2626917d0d15b2d339dbcf140807b27921319 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
-rw-r--r--src/tools/nacldeployqt/template_qtloader.cpp25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/tools/nacldeployqt/template_qtloader.cpp b/src/tools/nacldeployqt/template_qtloader.cpp
index bee8b646cd..fe4bd98aa5 100644
--- a/src/tools/nacldeployqt/template_qtloader.cpp
+++ b/src/tools/nacldeployqt/template_qtloader.cpp
@@ -186,22 +186,27 @@ function loadScript(src, onload)
// Create Qt container element, possibly re-using existingElement
function createElement(existingElement)
{
- // Create container div which handles load and message events
- var listener = existingElement || document.createElement("div");
- self.listener = listener;
+ // Create container div
+ self.listener = existingElement || document.createElement("div");
+ self.listener.setAttribute("class", "qt-container");
- listener.setAttribute("class", "qt-container");
+ // Add load and progress event listeners
var useCapture = true;
- listener.addEventListener('message', onMessage, useCapture);
- listener.addEventListener('progress', onProgress, useCapture);
- listener.addEventListener('load', onLoad, useCapture);
+ self.listener.addEventListener('message', onMessage, useCapture);
+ self.listener.addEventListener('progress', onProgress, useCapture);
+ self.listener.addEventListener('load', onLoad, useCapture);
- // create loading text placeholder
+ // Add loading text placeholder to container
self.loadTextNode = document.createElement("span");
self.loadTextNode.setAttribute("class", "qt-progress");
- listener.appendChild(self.loadTextNode);
+ self.listener.appendChild(self.loadTextNode);
- return listener;
+ // Check for (P)NaCl support
+ var pnaclSupported = navigator.mimeTypes['application/x-pnacl'] !== undefined;
+ if (!pnaclSupported && self.type != "emscripten")
+ self.loadTextNode.innerHTML = "Sorry! Google Chrome is required.";
+
+ return self.listener;
}
function load()