commit | e28bf0d2c12ac4a11da0b54540e1646880e9fc4b | [log] [tgz] |
---|---|---|
author | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 07 11:07:49 2015 +0200 |
committer | Matteo Scandolo <matteo.scandolo@link-me.it> | Wed Oct 07 11:07:49 2015 +0200 |
tree | 2ee2cfb20ed5f7e4eaf6bdffdadf3c77b42f9c96 | |
parent | db16135b28bb97cc6f1fcbc1f919078030722961 [diff] |
Moved fixtures in a separated folder
diff --git a/xos/core/xoslib/spec/xoslib/make_same_width.html b/xos/core/xoslib/spec/xoslib/fixtures/xos-utils/make_same_width.html similarity index 100% rename from xos/core/xoslib/spec/xoslib/make_same_width.html rename to xos/core/xoslib/spec/xoslib/fixtures/xos-utils/make_same_width.html
diff --git a/xos/core/xoslib/spec/xoslib/table_rows.html b/xos/core/xoslib/spec/xoslib/fixtures/xos-utils/table_rows.html similarity index 100% rename from xos/core/xoslib/spec/xoslib/table_rows.html rename to xos/core/xoslib/spec/xoslib/fixtures/xos-utils/table_rows.html
diff --git a/xos/core/xoslib/spec/xoslib/template_from_id.html b/xos/core/xoslib/spec/xoslib/fixtures/xos-utils/template_from_id.html similarity index 100% rename from xos/core/xoslib/spec/xoslib/template_from_id.html rename to xos/core/xoslib/spec/xoslib/fixtures/xos-utils/template_from_id.html
diff --git a/xos/core/xoslib/spec/xoslib/utils.test.js b/xos/core/xoslib/spec/xoslib/utils.test.js index 7009c00..ec06768 100644 --- a/xos/core/xoslib/spec/xoslib/utils.test.js +++ b/xos/core/xoslib/spec/xoslib/utils.test.js
@@ -6,7 +6,7 @@ beforeEach(() => { f = jasmine.getFixtures(); - f.fixturesPath = 'base/spec/xoslib'; + f.fixturesPath = 'base/spec/xoslib/fixtures/xos-utils'; }); describe('The idInArray method', function() {
diff --git a/xos/core/xoslib/static/js/xoslib/xos-backbone.js b/xos/core/xoslib/static/js/xoslib/xos-backbone.js index abce329..4ba763d 100644 --- a/xos/core/xoslib/static/js/xoslib/xos-backbone.js +++ b/xos/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -40,8 +40,6 @@ CORDSUBSCRIBER_API = XOSLIB_BASE + "/cordsubscriber/"; CORDUSER_API = XOSLIB_BASE + "/corduser/"; - console.log(Backbone); - XOSModel = Backbone.Model.extend({ relatedCollections: [], foreignCollections: [],