diff --git a/homework/content.js b/homework/content.js
index 710be28..0a46fba 100644
--- a/homework/content.js
+++ b/homework/content.js
@@ -1,37 +1,40 @@
'use strict';
-(function() {
- var _wrapper = document.querySelector('#note-content-wrapper');
-
- function start() {
- window.addEventListener('note-open', function(event) {
- var note = event.detail;
- resetWrapper();
- drawNote(note);
- });
+(function(exports) {
+ var ContentManager = function(){
+ this._wrapper = document.querySelector('#note-content-wrapper');
}
- function resetWrapper() {
- _wrapper.innerHTML = '';
- }
+ ContentManager.prototype ={
+
+ start(){
+ window.addEventListener('note-open',(function(event){
+ var note = event.detail;
+ this.resetWrapper();
+ this.drawNote(note);
+ }).bind(this));
+ },
- function drawNote(note) {
- var title = note.title;
- var h = document.createElement('h2');
- h.textContent = title;
- var passages = note.passages;
- var buff = document.createDocumentFragment();
- passages.forEach(function(passage) {
- var p = document.createElement('p');
- p.classList.add('note-passage');
- p.textContent = passage;
- buff.appendChild(p);
- });
- _wrapper.appendChild(h);
- _wrapper.appendChild(buff);
- }
+ resetWrapper(){
+ this._wrapper.innerHTML = '';
+ },
+
+ drawNote(note){
+ var title = note.title;
+ var h = document.createElement('h2');
+ h.textContent = title;
+ var passages = note.passages;
+ var buff = document.createDocumentFragment();
+ passages.forEach(function(passage){
+ var p = document.createElement('p');
+ p.classList.add('note-passage');
+ p.textContent = passage;
+ buff.appendChild(p);
+ });
+ this._wrapper.appendChild(h);
+ this._wrapper.appendChild(buff);
+ }
+};
- document.addEventListener('DOMContentLoaded', function(event) {
- start();
- });
-})();
+ exports.ContentManager = ContentManager;
+ })(window);
diff --git a/homework/index.html b/homework/index.html
index e387963..975d252 100644
--- a/homework/index.html
+++ b/homework/index.html
@@ -5,6 +5,7 @@
Homework - Note List
+
diff --git a/homework/list.js b/homework/list.js
index 21eddbc..45ebbe6 100644
--- a/homework/list.js
+++ b/homework/list.js
@@ -1,79 +1,83 @@
'use strict';
-(function() {
+(function(exports) {
- var _listNoteContent = [];
- var _wrapper = document.querySelector('#note-list-wrapper');
-
- function start() {
- fetchList(function(data) {
- updateList(data);
- drawList();
- preloadFirstNote();
- });
- window.addEventListener('click', function(event) {
- onNoteOpen(event);
- });
+ var ListManager = function(){
+ this._listNoteContent = [];
+ this._wrapper = document.querySelector('#note-list-wrapper');
}
- function onNoteOpen(event) {
- if (event.target.classList.contains('note-title')) {
- var id = event.target.dataset.noteId;
- var content = _listNoteContent[id];
- window.dispatchEvent(new CustomEvent('note-open',
- { detail: content }));
- };
- }
+ ListManager.prototype = {
+ start(){
+ this.fetchList().then((function(data){
+ this.updateList(data);
+ this.drawList();
+ this.preloadFirstNote();
+ }).bind(this)).catch((function(){
- function preloadFirstNote() {
- if (_listNoteContent.length !== 0) {
- var content = _listNoteContent[0];
- window.dispatchEvent(new CustomEvent('note-open',
- { detail: content }));
- }
- }
+ }).bind(this));
+ window.addEventListener('click',(function(event){
+ this.onNoteOpen(event);
+ }).bind(this));
+ },
- function updateList(list) {
- _listNoteContent = list;
- }
+ onNoteOpen(event){
+ if(event.target.classList.contains('note-title')){
+ var id = event.target.dataset.noteId;
+ var content = this._listNoteContent[id];
+ window.dispatchEvent(new CustomEvent('note-open',
+ { detail: content }));
+ };
+ ),
- function drawList() {
- var list = _listNoteContent;
- var ul = document.createElement('ul');
- ul.id = 'note-title-list';
- var buff = document.createDocumentFragment();
- list.forEach(function(note, i) {
- var li = document.createElement('li');
- li.dataset.noteId = i;
- li.classList.add('note-title');
- li.textContent = note.title;
- // Note: buff is captured, so we now have a
- // little closure naturally.
- buff.appendChild(li);
- });
- ul.appendChild(buff);
- _wrapper.appendChild(ul);
- }
-
- function fetchList(afterFetch) {
- var xhr = new XMLHttpRequest();
- xhr.open('GET', 'http://127.0.0.1:8000/demo-list-notes.json', true);
- xhr.responseType = 'json';
- xhr.onreadystatechange = function(e) {
- // Watch out: we have a mysterious unknown 'this'.
- if (this.readyState === 4 && this.status === 200) {
- var listData = this.response;
- // The flow ends here.
- afterFetch(listData);
- } else if (this.status !== 200 ){
- // Ignore error in this case.
+ preloadFirstNote(){
+ if(this._listNoteContent.length !== 0){
+ var content = this._listNoteContent[0];
+ window.dispatchEvent(new CustomEvent('note-open',
+ { detail: content }));
}
- };
- xhr.send();
- }
+ },
+
+ updateList(list){
+ this._listNoteContent = list;
+ },
- document.addEventListener('DOMContentLoaded', function(event) {
- start();
- });
+ drawList(){
+ var list = this._listNoteContent;
+ var ul = document.createElement('ul');
+ ul.id = 'note-title-list';
+ var buff = document.createDocumentFragment();
+ list.forEach(function(note, i){
+ var li = document.createElement('li');
+ li.dataset.noteId = i;
+ li.classList.add('note-title');
+ li.textContent = note.title;
+ // Note: buff is captured, so we now have a
+ // little closure naturally
+ buff.appendChild(li);
+ });
+ ul.appendChild(buff);
+ this._wrapper.appendChild(ul);
+ },
-})();
+ fetchList(){
+ return new Promise(function(resolve, reject){
+ var xhr = new XMLHttpRequest();
+ xhr.open('GET', 'http://127.0.0.1:8000/demo-list-notes.json', true);
+ xhr.responseType = 'json';
+ xhr.onreadystatechange = function(e){
+ if(xhr.readyState === 4 && xhr.status === 200){
+ var listData = xhr.response;
+ // The flow ends here.
+ resolve(listData);
+ }
+ else if (xhr.status !== 200){
+ reject(xhr);
+ }
+ };
+ xhr.send();
+ });
+ }
+ }
+ exports.ListManager = ListManager;
+})(window);
diff --git a/homework/main.js b/homework/main.js
new file mode 100644
index 0000000..db22d8f
--- /dev/null
+++ b/homework/main.js
@@ -0,0 +1,9 @@
+'use strict'
+
+ // Kick off
+document.addEventListener('DOMContentLoaded',function(event){
+ var contentManager = new ContentManager();
+ var listManager = new ListManager();
+ contentManager.start();
+ listManager.start();
+});
diff --git a/homework/package.json b/homework/package.json
index a019e65..4202b36 100644
--- a/homework/package.json
+++ b/homework/package.json
@@ -15,7 +15,7 @@
"sinon": "^1.17.1"
},
"scripts": {
- "test": "mocha"
+ "test": "./node_modules/karma/bin/karma start"
},
"author": "",
"license": "ISC"
diff --git a/homework/test/test-list.js b/homework/test/test-list.js
index 441fc45..8fd915c 100644
--- a/homework/test/test-list.js
+++ b/homework/test/test-list.js
@@ -1,8 +1,24 @@
-describe('Test > ', function() {
+describe('Test ListManager', function() {
+ var subject;
+
beforeEach(function() {
+ subject = new ListManager();
});
- it('will test some pure functions', function() {
- // Write any pure function assertion here.
+ describe('updateList',function(){
+ it('will update the inner list of the manager', function(){
+ var manager = subject;
+ var dummuyList = [
+ { "title": "US signals shift in Syria-Iraq campaign against Islamic State",
+ "passages": [
+ "The US has indicated a shift in its campaign against Islamic State (IS) militants in Iraq and Syria, including the use of direct ground raids.",
+ "Defence Secretary Ash Carter said there would also be more air strikes against high-value targets."
+ ]}
+ ];
+
+ manager.updateList(dummuyList);
+
+ assert.equal(subject._listNoteContent, dummyList);
+ });
});
});