Commit 74ac32c4 authored by Nicolas Biri's avatar Nicolas Biri
Browse files

Move reactoring to master

parent e3eb40e8
...@@ -177,7 +177,7 @@ function Mapping() { ...@@ -177,7 +177,7 @@ function Mapping() {
} }
Mapping.prototype.findEntry = function(k) { Mapping.prototype.findEntry = function(k) {
return _.find(this[k.__meta__.uuid], function(x) {return x.key === k;}); return _.find(this[JSMF.jsmfId(k)], function(x) {return x.key === k;});
} }
Mapping.prototype.valuesFor = function(k) { Mapping.prototype.valuesFor = function(k) {
...@@ -186,7 +186,7 @@ Mapping.prototype.valuesFor = function(k) { ...@@ -186,7 +186,7 @@ Mapping.prototype.valuesFor = function(k) {
} }
Mapping.prototype.map = function(k, v) { Mapping.prototype.map = function(k, v) {
var key = k.__meta__.uuid; var key = JSMF.jsmfId(k);
if (key === undefined) { if (key === undefined) {
throw new Error('Invalid key for mapping: ' + k); throw new Error('Invalid key for mapping: ' + k);
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"dependencies": { "dependencies": {
"lodash": "~4.1.0", "lodash": "~4.1.0",
"object-hash": "~0.9.2", "object-hash": "~0.9.2",
"jsmf-core": "git+ssh://git@git.list.lu:jsmf/jsmf-core.git#refactored" "jsmf-core": "git+ssh://git@git.list.lu:jsmf/jsmf-core.git#0.4.0"
}, },
"devDependencies": { "devDependencies": {
"should": "~7.1.1", "should": "~7.1.1",
......
...@@ -34,6 +34,6 @@ describe('References resolution', function() { ...@@ -34,6 +34,6 @@ describe('References resolution', function() {
target.modellingElements.Foo[0].foo.should.have.length(1); target.modellingElements.Foo[0].foo.should.have.length(1);
done(); done();
}); });
}); });
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment