Merge pull request #57 from canjs/merge-master-to-major

Merge master to major

.gitignore

@@ -29,3 +29,4 @@ node_modules
 
 doc/
 dist/
+package-lock.json

can-view-model.js

@@ -2,7 +2,7 @@
 var domData = require("can-util/dom/data/data");
 var SimpleMap = require("can-simple-map");
 var ns = require("can-namespace");
-var getDocument = require("can-util/dom/document/document");
+var getDocument = require("can-globals/document/document");
 var isArrayLike = require("can-util/js/is-array-like/is-array-like");
 var canReflect = require("can-reflect");
 

can-view-model.md

@@ -1,5 +1,6 @@
 @module {function} can-view-model can-view-model
-@parent can-infrastructure
+@parent can-views
+@collection can-infrastructure
 @package ./package.json
 
 @description Gets the ViewModel of an [element](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement).

package.json

@@ -1,8 +1,8 @@
 {
   "name": "can-view-model",
   "version": "4.0.0-pre.3",
-  "description": "gets or sets the view model of an element",
-  "homepage": "http://canjs.com",
+  "description": "Gets or sets the view model of an element.",
+  "homepage": "https://canjs.com/doc/can-view-model.html",
   "author": {
     "name": "Bitovi",
     "email": "contact@bitovi.com",
@@ -28,6 +28,7 @@
     "donejs"
   ],
   "dependencies": {
+    "can-globals": "^0.2.3",
     "can-namespace": "1.0.0",
     "can-reflect": "^1.2.1",
     "can-simple-map": "^4.0.0-pre.2",