wapplr 1.0.41 → 1.0.45

package/dist/client/createClient.js

@@ -60,18 +60,27 @@ function createClient() {
     wapplrClient.close();
     wapplrClient.history.listen(function (_ref) {
       var action = _ref.action,
-          location = _ref.location;
+          location = _ref.location,
+          state = _ref.state;
       wapplrClient.app({
         history: {
           action: action,
-          location: location
+          location: location,
+          state: state
         }
       });
     });
     wapplrClient.app({
       history: {
         action: "POP",
-        location: history.location
+        location: {
+          pathname: window.location.pathname,
+          search: window.location.search,
+          hash: window.location.hash
+        },
+        state: {
+          key: 0
+        }
       }
     }, {}, function out() {
       var globals = wapp.globals;

package/dist/client/history.js

@@ -57,7 +57,7 @@ function createHistoryManager() {
     });
   }
 
-  function defaultHandlePop(e) {
+  function defaultHandlePop() {
     var _window$location = window.location,
         pathname = _window$location.pathname,
         search = _window$location.search,
@@ -69,13 +69,12 @@ function createHistoryManager() {
       hash: hash
     };
     state.key = state.key || createKey();
-    history.location = newLocation;
-    history.state = state;
-    defaultRunListeners({
+    history.runListeners({
       action: "POP",
-      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, history.location), {}, {
-        key: history.state.key
-      })
+      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newLocation), {}, {
+        key: state.key
+      }),
+      state: state
     });
   }
 
@@ -124,8 +123,7 @@ function createHistoryManager() {
     return partialPath;
   }
 
-  function defaultPush(to) {
-    var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  function defaultPush(to, inputState) {
     var _window$location2 = window.location,
         pathname = _window$location2.pathname,
         search = _window$location2.search,
@@ -136,15 +134,15 @@ function createHistoryManager() {
       hash: hash
     }, typeof to === "string" ? history.parsePath(to) : to);
     var url = createHref(newLocation);
+    var state = inputState || {};
     state.key = state.key || createKey();
-    history.location = newLocation;
-    history.state = state;
     globalHistory.pushState(state, "", url);
     history.runListeners({
       action: "PUSH",
-      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, history.location), {}, {
-        key: history.state.key
-      })
+      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newLocation), {}, {
+        key: state.key
+      }),
+      state: state
     });
   }
 
@@ -158,18 +156,20 @@ function createHistoryManager() {
     return history.addListener(fn);
   }
 
+  function defaultGetState() {
+    return history.globalHistory.state || {};
+  }
+
   var history = Object.create(Object.prototype, {
     globalHistory: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       writable: false,
       enumerable: false,
       value: globalHistory
     }),
-    location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: {
-        pathname: window.location.pathname,
-        search: window.location.search,
-        hash: window.location.hash
-      }
+    getState: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
+      writable: false,
+      enumerable: false,
+      value: defaultGetState
     }),
     key: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: "initial"

package/dist/common/utils.js

@@ -27,12 +27,22 @@ var defaultDescriptor = {
 exports.defaultDescriptor = defaultDescriptor;
 
 function copyObject(obj) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
   function cloneObj() {
+    var _options$skip = options.skip,
+        skip = _options$skip === void 0 ? [] : _options$skip,
+        _options$keep = options.keep,
+        keep = _options$keep === void 0 ? [] : _options$keep;
     var clone = {};
 
     for (var key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        clone[key] = copyObject(obj[key]);
+      if (keep.indexOf(key) === -1 && skip.indexOf(key) === -1 && obj.hasOwnProperty(key)) {
+        clone[key] = copyObject(obj[key], options);
+      }
+
+      if (keep.indexOf(key) > -1) {
+        clone[key] = obj[key];
       }
     }
 
@@ -41,7 +51,7 @@ function copyObject(obj) {
 
   function cloneArr() {
     return obj.map(function (item) {
-      return copyObject(item);
+      return copyObject(item, options);
     });
   }
 

package/package.json

@@ -22,7 +22,7 @@
     "files": [
         "dist/*"
     ],
-    "version": "1.0.41",
+    "version": "1.0.45",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {