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

Set custom map on element #20

Merged
merged 3 commits into from
May 19, 2017
Merged

Set custom map on element #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
316fd95
fix set custom map on element with SimpleMap
cherifGsoul Feb 3, 2017
e61274e
fix set custom map on element with simple-map can-map and define-map
cherifGsoul Feb 10, 2017
cb273c0
fix conflicts
cherifGsoul May 19, 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
7 changes: 6 additions & 1 deletion can-view-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ var ns = require("can-namespace");
var getDocument = require("can-util/dom/document/document");
var isArrayLike = require('can-util/js/is-array-like/is-array-like');
module.exports = ns.viewModel = function (el, attr, val) {
var scope ;
if (typeof el === 'string') {
el = getDocument().querySelector(el);
} else if (isArrayLike(el)) {
el= el[0];
}

var scope = domData.get.call(el, "viewModel");
if (types.isMapLike(attr)) {
return domData.set.call( el, "viewModel", attr);
}

scope = domData.get.call(el, "viewModel");
if(!scope) {
scope = types.DefaultMap ? new types.DefaultMap() : new SimpleMap();
domData.set.call(el, "viewModel", scope);
Expand Down
32 changes: 32 additions & 0 deletions can-view-model_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var QUnit = require('steal-qunit');
var viewModel = require('can-view-model');
var SimpleMap = require('can-simple-map');
var CanMap = require('can-map');
var DefineMap = require("can-define/map/map");
var types = require('can-types');

QUnit.module('can-view-model');
Expand All @@ -27,6 +29,36 @@ QUnit.test('a selector can be passed as the first argument (#6)', function(){
types.DefaultMap = DefaultMap;
});

QUnit.test('set custom can-simple-map on element (#5)', function(){
var vm, elVm;
var CustomMap = SimpleMap.extend({});
var el = document.createElement('div');
document.getElementById('qunit-fixture').appendChild(el);
vm = new CustomMap({ foo: 'bar' });
elVm = viewModel(el, vm);
QUnit.equal(viewModel(el,'foo'), 'bar');
});

QUnit.test('set custom can-map on element (#5)', function(){
var vm, elVm;
var CustomMap = CanMap.extend({});
var el = document.createElement('div');
document.getElementById('qunit-fixture').appendChild(el);
vm = new CustomMap({ foo: 'bar' });
elVm = viewModel(el, vm);
QUnit.equal(viewModel(el,'foo'), 'bar');
});

QUnit.test('set custom can-define-map on element (#5)', function(){
var vm, elVm;
var CustomMap = DefineMap.extend({});
var el = document.createElement('div');
document.getElementById('qunit-fixture').appendChild(el);
vm = new CustomMap({ foo: 'bar' });
elVm = viewModel(el, vm);
QUnit.equal(viewModel(el,'foo'), 'bar');
});

QUnit.test('Allow passing array like (jQuery) element', function(){
var DefaultMap = types.DefaultMap;
var $el = {};
Expand Down