mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-05-24 20:14:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ready event.

Browse source
This commit is contained in:
Lars Jung 2015-04-27 21:48:56 +02:00
parent 2b834f0233
commit 1e00e2b733
4 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/_h5ai/client/js/inc/core/location.js
View file

@ -186,11 +186,6 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/event', 'core/notify',
}; };
} }
event.sub('ready', function () {
setLocation(document.location.href, true);
});
return { return {
forceEncoding: forceEncoding, forceEncoding: forceEncoding,

4
src/_h5ai/client/js/inc/main/index.js
View file

@ -1,4 +1,4 @@
modulejs.define('main/index', ['_', 'core/event'], function (_, event) { modulejs.define('main/index', ['_', 'core/location'], function (_, location) {
modulejs.require('view/viewmode'); modulejs.require('view/viewmode');
@ -9,5 +9,5 @@ modulejs.define('main/index', ['_', 'core/event'], function (_, event) {
} }
}); });
event.pub('ready'); location.setLocation(document.location.href, true);
}); });

6
test/styles.less
View file

@ -188,12 +188,10 @@
pre { pre {
display: block; display: block;
float: left; font-family: monospace;
clear: left; font-size: 12px;
font: 12px monospace;
margin: 4px 0 16px 18px; margin: 4px 0 16px 18px;
padding: 0 8px; padding: 0 8px;
max-width: 80%;
word-wrap: break-word; word-wrap: break-word;
border-left: 2px solid @col-grey-800; border-left: 2px solid @col-grey-800;

26
test/tests/unit/main/index.js
View file

@ -2,7 +2,7 @@
'use strict'; 'use strict';
var ID = 'main/index'; var ID = 'main/index';
var DEPS = ['_', 'core/event']; var DEPS = ['_', 'core/location'];
describe('module \'' + ID + '\'', function () { describe('module \'' + ID + '\'', function () {
@ -10,22 +10,19 @@ describe('module \'' + ID + '\'', function () {
this.definition = modulejs._private.definitions[ID]; this.definition = modulejs._private.definitions[ID];
this.xEvent = {pub: sinon.stub()}; this.xLocation = {setLocation: sinon.stub()};
this.xDefine = sinon.stub(modulejs, 'define');
this.xRequire = sinon.stub(modulejs, 'require'); this.xRequire = sinon.stub(modulejs, 'require');
this.applyFn = function () { this.applyFn = function () {
this.xEvent.pub.reset(); this.xLocation.setLocation.reset();
this.xDefine.reset();
this.xRequire.reset(); this.xRequire.reset();
return this.definition.fn(_, this.xEvent); return this.definition.fn(_, this.xLocation);
}; };
}); });
after(function () { after(function () {
this.xDefine.restore();
this.xRequire.restore(); this.xRequire.restore();
}); });
@ -70,13 +67,6 @@ describe('module \'' + ID + '\'', function () {
assert.isUndefined(instance); assert.isUndefined(instance);
}); });
it('publishes ready event', function () {
this.applyFn();
assert.isTrue(this.xEvent.pub.calledOnce);
assert.deepEqual(this.xEvent.pub.firstCall.args, ['ready']);
});
it('requires view/viewmode', function () { it('requires view/viewmode', function () {
this.applyFn(); this.applyFn();
@ -121,6 +111,14 @@ describe('module \'' + ID + '\'', function () {
} }
}); });
}); });
it('calls setLocation with current href, keeping browser url', function () {
this.applyFn();
assert.isTrue(this.xLocation.setLocation.calledOnce);
assert.deepEqual(this.xLocation.setLocation.firstCall.args, [document.location.href, true]);
assert.isTrue(this.xLocation.setLocation.calledAfter(this.xRequire));
});
}); });
}); });