mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2024-09-19 20:28:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor notifications.

Browse source
This commit is contained in:
Lars Jung 2015-04-29 01:13:30 +02:00
parent 73496c6b7c
commit 2365c23af7
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/_h5ai/client/js/inc/view/notification.js
View file

@ -1,19 +1,21 @@
modulejs.define('view/notification', ['$'], function ($) { modulejs.define('view/notification', ['$', 'view/root'], function ($, root) {
var template = '<div id="notification"/>'; var template = '<div id="notification"/>';
var $el = $(template);
function set(content) { function set(content) {
if (content) { if (content) {
$('#notification').stop(true, true).html(content).fadeIn(400); $el.stop(true, true).html(content).fadeIn(400);
} else { } else {
$('#notification').stop(true, true).fadeOut(400); $el.stop(true, true).fadeOut(400);
} }
} }
$(template).hide().appendTo('body'); $el.hide().appendTo(root.$el);
return { return {
$el: $el,
set: set set: set
}; };
}); });

26
test/tests/unit/view/notification.js
View file

@ -2,7 +2,7 @@
'use strict'; 'use strict';
var ID = 'view/notification'; var ID = 'view/notification';
var DEPS = ['$']; var DEPS = ['$', 'view/root'];
describe('module \'' + ID + '\'', function () { describe('module \'' + ID + '\'', function () {
@ -10,9 +10,10 @@ describe('module \'' + ID + '\'', function () {
this.definition = modulejs._private.definitions[ID]; this.definition = modulejs._private.definitions[ID];
this.xRoot = {$el: null};
this.applyFn = function () { this.applyFn = function () {
return this.definition.fn($); return this.definition.fn($, this.xRoot);
}; };
}); });
@ -24,6 +25,7 @@ describe('module \'' + ID + '\'', function () {
beforeEach(function () { beforeEach(function () {
util.restoreHtml(); util.restoreHtml();
this.xRoot.$el = $('<div id="root"/>').appendTo('body');
}); });
describe('definition', function () { describe('definition', function () {
@ -61,22 +63,34 @@ describe('module \'' + ID + '\'', function () {
describe('application', function () { describe('application', function () {
it('returns plain object with 1 property', function () { it('returns plain object with 2 properties', function () {
var instance = this.applyFn(); var instance = this.applyFn();
assert.isPlainObject(instance); assert.isPlainObject(instance);
assert.lengthOfKeys(instance, 1); assert.lengthOfKeys(instance, 2);
}); });
it('adds HTML', function () { it('adds HTML #notification to #root (hidden)', function () {
this.applyFn(); this.applyFn();
assert.lengthOf($('#notification'), 1); assert.lengthOf($('#root > #notification'), 1);
assert.lengthOf($('#notification:visible'), 0); assert.lengthOf($('#notification:visible'), 0);
assert.strictEqual($('#notification').text(), ''); assert.strictEqual($('#notification').text(), '');
}); });
}); });
describe('.$el', function () {
it('is $(\'#notification\')', function () {
var instance = this.applyFn();
assert.isObject(instance.$el);
assert.lengthOf(instance.$el, 1);
assert.isString(instance.$el.jquery);
assert.strictEqual(instance.$el.attr('id'), 'notification');
});
});
describe('.set()', function () { describe('.set()', function () {
it('is function', function () { it('is function', function () {