added qs scraping and the search bar

phonegap · Jul 7, 2012 · 1b3e379 · 1b3e379
1 parent b511a3a
commit 1b3e379
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 58 deletions.
diff --git a/app.js b/app.js
@@ -14,14 +14,6 @@ app.get('/', function (req, res) {
     res.sendfile(__dirname + '/public/index.html');
 });
 
-app.get('/:id/*?', function (req, res) {
-    var path = __dirname + "/dump" + req.originalUrl.split("?")[0];
-    //HACK: we need to handle files that are not html
-    var data = fs.readFileSync(path, 'utf8');
-    data += "<script src='/js/detect.js'></script>";
-    res.send(data);
-});
-
 var port = process.env.PORT || 3000;
 app.listen(port, function(){
   console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);

diff --git a/dump/guid_1234/index.html b/dump/guid_1234/index.html
diff --git a/public/css/style.css b/public/css/style.css
@@ -12,3 +12,13 @@ body {
 a {
   color: #00B7FF;
 }
+
+#address {
+    width:80%;
+    height: auto;
+    font-size: 2em;
+}
+
+#go {
+    font-size: 2em;
+}
diff --git a/public/index.html b/public/index.html
@@ -1,23 +1,29 @@
 <html>
     <head>
     	<title>emulate.phonegap.com</title>
-        <link rel="stylesheet" href="/css/style.css" />
+        <link rel="stylesheet" href="css/style.css" />
+        <script src="js/index.js"></script>
     </head>
     <body>
-        <div class="header">
-            <img src="/images/cordova_bot.png" alt="" />
+        <section class="header">
+            <img src="images/cordova_bot.png" alt="" />
             +
-            <img src="/images/ripple.png" alt="" />
+            <img src="images/ripple.png" alt="" />
             =
-            <img src="/images/FUCK-YEAH.jpg" alt="" />
-        </div>
+            <img src="images/FUCK-YEAH.jpg" alt="" />
+        </section>
 
-        <div>
-            This is a quick prototype of some thoughts on emulate.phonegap.com
-        </div>
+        <section id="navigate" style="display: none">
+        	<input id="address" type="text" />
+            <button id="go">GO</button>
+        </section>
 
-        <div>
-            <a href="/guid_1234/index.html?enableripple=true">Link to sample hosted app</a>
-        </div>
+        <section id="browser-warning" style="display: none">
+            OMFG, you needz to be on chrome
+        </section>
+
+        <section id="ripple-warning" style="display: none">
+            OMFG, you needz the ripples
+        </section>
     </body>
 </html>
diff --git a/public/js/detect.js b/public/js/detect.js
diff --git a/public/js/index.js b/public/js/index.js
@@ -0,0 +1,56 @@
+var netherworld = {
+    hasRipplez: function () {
+        return document.getElementById("tinyhippos-injected");
+    },
+
+    goto: function (uri) {
+        //TODO: Test if window.chrome exists on chromium
+        if (window.chrome && netherworld.hasRipplez()) {
+            //TODO: ensure that enableripple=cordova
+
+            if (!uri.match("enableripple")) {
+                uri += uri.match(/\?/) ? "&enableripple=cordova" : "?enableripple=cordova";
+            }
+
+            if (!uri.match("^http")) {
+                uri = "http://" + uri;
+            }
+            console.log(uri);
+
+            //window.location.href = uri;
+        }
+    },
+
+    show: function (id) {
+        document.getElementById(id).setAttribute("style", "");
+    },
+
+    hide: function (id) {
+        document.getElementById(id).setAttribute("style", "display: none");
+    }
+
+};
+
+window.addEventListener("load", function () {
+    if (!window.chrome) {
+        console.log("asdf");
+        netherworld.show("browser-warning");
+    }
+    else if (!netherworld.hasRipplez()) {
+        console.log("ffda");
+        netherworld.show("ripple-warning");
+    }
+    else {
+        netherworld.show("navigate");
+
+        if (window.location.search) {
+            var uri = decodeURI(window.location.search.split("=")[1]);
+            netherworld.goto(uri);
+        }
+    }
+
+    document.getElementById("go").addEventListener("click", function () {
+        var address = document.getElementById("address");
+        netherworld.goto(address.value);
+    });
+});
diff --git a/routes/index.js b/routes/index.js
diff --git a/views/index.jade b/views/index.jade
diff --git a/views/layout.jade b/views/layout.jade