Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master to major #56

Merged
merged 6 commits into from
Nov 10, 2017
Merged

Merge master to major #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52549fb
Update docs with new @parent & @collection
chasenlehara Oct 30, 2017
158d9ef
Merge pull request #54 from canjs/landscaper/update-parent
chasenlehara Oct 30, 2017
e6b1a82
Remove redundant docs
chasenlehara Oct 31, 2017
097527e
Merge pull request #55 from canjs/3660-docs
chasenlehara Oct 31, 2017
9fa7f42
Update dist for release
imaustink Nov 1, 2017
7be5368
Merge branch 'master' into merge-master-to-major
chasenlehara Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions can-simple-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ var ensureMeta = function ensureMeta(obj) {

// this is a very simple can-map like object
var SimpleMap = Construct.extend("SimpleMap",
/**
* @prototype
*/
{
// ### setup
// A setup function for the instantiation of a simple-map.
Expand Down
3 changes: 2 additions & 1 deletion docs/simple-map.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@module {constructor} can-simple-map
@parent can-infrastructure
@parent can-observables
@collection can-infrastructure
@group can-simple-map.prototype 0 prototype
@inherits can-construct
@description A performant live-bound map.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "can-simple-map",
"version": "4.0.0-pre.9",
"description": "A performant live-bound map",
"homepage": "https://canjs.com",
"homepage": "https://canjs.com/doc/can-simple-map.html",
"repository": {
"type": "git",
"url": "git://github.com/canjs/can-simple-map.git"
Expand Down