Browse Source

loading default command at Command init module and removed toLoad property

pull/356/head
Arthur Almeida 8 years ago
parent
commit
e182808d43
  1. 12
      src/commands/index.js
  2. 30
      test/specs/commands/index.js

12
src/commands/index.js

@ -196,15 +196,9 @@ module.exports = () => {
if(c.em) if(c.em)
c.model = c.em.get('Canvas'); c.model = c.em.get('Canvas');
return this; this.loadDefaultCommands()
},
/** return this;
* On load callback
* @private
*/
onLoad() {
this.loadDefaultCommands();
}, },
/** /**
@ -258,7 +252,7 @@ module.exports = () => {
* */ * */
loadDefaultCommands() { loadDefaultCommands() {
for (var id in defaultCommands) { for (var id in defaultCommands) {
this.add(id, defaultCommands[id]); this.add(id, defaultCommands[id]);
} }
return this; return this;

30
test/specs/commands/index.js

@ -25,8 +25,30 @@ describe('Commands', () => {
expect(obj.get('test').test).toEqual('test'); expect(obj.get('test').test).toEqual('test');
}); });
it('No default commands at init', () => { it('Load default commands at init', () => {
expect(obj.get('select-comp')).toEqual(null); expect(obj.get('select-comp')).toNotEqual(null);
expect(obj.get('create-comp')).toNotEqual(null);
expect(obj.get('delete-comp')).toNotEqual(null);
expect(obj.get('image-comp')).toNotEqual(null);
expect(obj.get('move-comp')).toNotEqual(null);
expect(obj.get('text-comp')).toNotEqual(null);
expect(obj.get('insert-custom')).toNotEqual(null);
expect(obj.get('export-template')).toNotEqual(null);
expect(obj.get('sw-visibility')).toNotEqual(null);
expect(obj.get('open-layers')).toNotEqual(null);
expect(obj.get('open-sm')).toNotEqual(null);
expect(obj.get('open-tm')).toNotEqual(null);
expect(obj.get('open-blocks')).toNotEqual(null);
expect(obj.get('open-assets')).toNotEqual(null);
expect(obj.get('show-offset')).toNotEqual(null);
expect(obj.get('select-parent')).toNotEqual(null);
expect(obj.get('tlb-delete')).toNotEqual(null);
expect(obj.get('tlb-clone')).toNotEqual(null);
expect(obj.get('tlb-move')).toNotEqual(null);
expect(obj.get('fullscreen')).toNotEqual(null);
expect(obj.get('preview')).toNotEqual(null);
expect(obj.get('resize')).toNotEqual(null);
expect(obj.get('drag')).toNotEqual(null);
}); });
it('Default commands after loadDefaultCommands', () => { it('Default commands after loadDefaultCommands', () => {
@ -34,6 +56,10 @@ describe('Commands', () => {
expect(obj.get('select-comp')).toNotEqual(null); expect(obj.get('select-comp')).toNotEqual(null);
}); });
it('Commands module should not have toLoad property', () => {
expect(obj.toLoad).toEqual(null);
});
}); });
}); });

Loading…
Cancel
Save