First version of historyState argument to Location.go.

For #4
iron-meteor · Sep 17, 2014 · 6105b2e · 6105b2e
1 parent c78832a
commit 6105b2e
Show file tree

Hide file tree

Showing 12 changed files with 148 additions and 28 deletions.
diff --git a/examples/historyState/.meteor/.finished-upgraders b/examples/historyState/.meteor/.finished-upgraders
@@ -0,0 +1,6 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
diff --git a/examples/historyState/.meteor/.gitignore b/examples/historyState/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/examples/historyState/.meteor/.id b/examples/historyState/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+r44vi31sejv9otpmybw
diff --git a/examples/historyState/.meteor/cordova-plugins b/examples/historyState/.meteor/cordova-plugins
@@ -0,0 +1 @@
+
diff --git a/examples/historyState/.meteor/packages b/examples/historyState/.meteor/packages
@@ -0,0 +1,10 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-platform
+autopublish
+insecure
+iron:location
+
diff --git a/examples/historyState/.meteor/release b/examples/historyState/.meteor/release
@@ -0,0 +1 @@
+[email protected]
diff --git a/examples/historyState/.meteor/versions b/examples/historyState/.meteor/versions
@@ -0,0 +1,54 @@
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+iron:[email protected]
+iron:[email protected]
+iron:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
diff --git a/examples/historyState/historyState.html b/examples/historyState/historyState.html
@@ -0,0 +1,25 @@
+<head>
+  <title>historyState</title>
+</head>
+
+<body>
+  <h1>Welcome to Meteor!</h1>
+
+  {{> hello}}
+</body>
+
+<template name="hello">
+  <h1>Current state:</h1>
+  <pre>{{historyState}}</pre>
+
+  <form id="push">
+    <label>Push State</label>
+    <input type="text" name="push">
+    <button type="submit">Push</button>
+  </form>
+  <form id="replace">
+    <label>Replace State</label>
+    <input type="text" name="replace">
+    <button type="submit">Replace</button>
+  </form>
+</template>
diff --git a/examples/historyState/historyState.js b/examples/historyState/historyState.js
@@ -0,0 +1,19 @@
+if (Meteor.isClient) {
+  Template.hello.helpers({
+    historyState: function() {
+      return Iron.Location.get().options && 
+        Iron.Location.get().options.historyState;
+    }
+  });
+
+  Template.hello.events({
+    'submit #push': function(e, t) {
+      e.preventDefault();
+      Iron.Location.go('/' + Random.id(), {historyState: t.$('input').val()});
+    },
+    'submit #replace': function(e, t) {
+      e.preventDefault();
+      console.log("Can't do this yet");
+    }
+  })
+}
diff --git a/lib/location.js b/lib/location.js
@@ -43,14 +43,15 @@ var set = function (state) {
 
 var setStateFromEventHandler = function () {
   var href = location.href;
-
+  var state;
+
   if (isUsingHashPaths()) {
-    var state = new State(urlFromHashStyle(href));
-    set(state);
+    state = new State(urlFromHashStyle(href));
   } else {
-    var state = new State(href);
-    set(state);
+    state = new State(href, {historyState: history.state});
   }
+
+  set(state);
 };
 
 var fireOnClick = function (e) {
@@ -61,27 +62,21 @@ var fireOnClick = function (e) {
 /**
  * Go to a url.
  */
-var go = function (url) {
-  if (isUsingHashPaths()) {
-    var state = new State(url);
-
-    if (set(state)) {
+var go = function (url, options) {
+  var state = new State(url, options);
+
+  if (set(state)) {
+    Deps.afterFlush(function () {
       // if after we've flushed if nobody has cancelled the state then change
       // the url.
-      Deps.afterFlush(function () {
-        if (!state.isCancelled())
+      if (!state.isCancelled()) {
+        if (isUsingHashPaths()) {
           location.hash = fixHashPath(url); 
-      });
-    }
-  } else {
-    var state = new State(url);
-
-    if (set(state)) {
-      Deps.afterFlush(function () {
-        if (!state.isCancelled())
-          history.pushState(null, null, url);
-      });
-    }
+        } else {
+          history.pushState(state.options.historyState, null, url);
+        }
+      }
+    });
   }
 };
 
@@ -229,8 +224,8 @@ Location.onClick = function (fn) {
 /**
  * Go to a new url.
  */
-Location.go = function (url) {
-  return go(url);
+Location.go = function (url, options) {
+  return go(url, options);
 };
 
 /**

diff --git a/lib/state.js b/lib/state.js
@@ -1,9 +1,10 @@
 var Url = Iron.Url;
 
-State = function (url) {
-  _.extend(this, Url.parse(url));
+State = function (url, options) {
+  _.extend(this, Url.parse(url), {options: options || {}});
 };
 
+// XXX: should this compare options (e.g. history.state?)
 State.prototype.equals = function (other) {
   if (!other)
     return false;

diff --git a/versions.json b/versions.json
@@ -38,6 +38,6 @@
     ]
   ],
   "pluginDependencies": [],
-  "toolVersion": "[email protected].30",
+  "toolVersion": "[email protected].29",
   "format": "1.0"
 }