diff --git a/homework/content.js b/homework/content.js index 710be28..cf51b6d 100644 --- a/homework/content.js +++ b/homework/content.js @@ -1,21 +1,27 @@ 'use strict'; -(function() { - var _wrapper = document.querySelector('#note-content-wrapper'); +(function(exports) { + + var TodoContentManager = function() { + // Will be an element as the list wrapper. + this._wrapper = document.querySelector('#note-content-wrapper'); +}; - function start() { - window.addEventListener('note-open', function(event) { +TodoContentManager.prototype = { + + start() { + window.addEventListener(('note-open', function(event) { var note = event.detail; resetWrapper(); drawNote(note); - }); - } + }).bind(this)); + }, - function resetWrapper() { - _wrapper.innerHTML = ''; - } + resetWrapper() { + this._wrapper.innerHTML = ''; + }, - function drawNote(note) { + drawNote(note) { var title = note.title; var h = document.createElement('h2'); h.textContent = title; @@ -27,11 +33,11 @@ p.textContent = passage; buff.appendChild(p); }); - _wrapper.appendChild(h); - _wrapper.appendChild(buff); + this._wrapper.appendChild(h); + this._wrapper.appendChild(buff); } +}; - document.addEventListener('DOMContentLoaded', function(event) { - start(); - }); -})(); + + exports.TodoContentManager = TodoContentManager; +})(window); diff --git a/homework/index.html b/homework/index.html index e387963..ad28075 100644 --- a/homework/index.html +++ b/homework/index.html @@ -3,6 +3,7 @@ Homework - Note List + diff --git a/homework/list.js b/homework/list.js index 21eddbc..a23d4dd 100644 --- a/homework/list.js +++ b/homework/list.js @@ -1,44 +1,48 @@ 'use strict'; -(function() { +(function(exports) { + + var TodoListManager = function() { + this._listNoteContent = []; + this._wrapper = document.querySelector('#note-list-wrapper'); + }; + +TodoListManager.prototype = { + + start() { + this.fetchList((function(data) { + this.updateList(data); + this.drawList(); + this.preloadFirstNote(); + }).bind(this)); + window.addEventListener(('click', function(event) { + this.onNoteOpen(event); + }).bind(this)); + }, - 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); - }); - } - - function onNoteOpen(event) { + onNoteOpen(event) { if (event.target.classList.contains('note-title')) { var id = event.target.dataset.noteId; - var content = _listNoteContent[id]; + var content = this._listNoteContent[id]; window.dispatchEvent(new CustomEvent('note-open', { detail: content })); }; } - function preloadFirstNote() { - if (_listNoteContent.length !== 0) { - var content = _listNoteContent[0]; + preloadFirstNote() { + if (this._listNoteContent.length !== 0) { + var content = this_listNoteContent[0]; window.dispatchEvent(new CustomEvent('note-open', { detail: content })); } - } + }, - function updateList(list) { - _listNoteContent = list; - } + updateList(list) { + this._listNoteContent = list; + }, - function drawList() { - var list = _listNoteContent; + drawList() { + var list = this._listNoteContent; var ul = document.createElement('ul'); ul.id = 'note-title-list'; var buff = document.createDocumentFragment(); @@ -52,28 +56,28 @@ buff.appendChild(li); }); ul.appendChild(buff); - _wrapper.appendChild(ul); - } + this._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. - } - }; - xhr.send(); + fetchList(afterFetch) { + 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) { + // 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. + } + }; + xhr.send(); + }).bind(this)); } +} - document.addEventListener('DOMContentLoaded', function(event) { - start(); - }); - -})(); +exports.TodoListManager = TodoListManager; +})(window); diff --git a/homework/main.js b/homework/main.js new file mode 100644 index 0000000..ba6648d --- /dev/null +++ b/homework/main.js @@ -0,0 +1,8 @@ +'use strict'; + +document.addEventListener('DOMContentLoaded',function(event){ + var ToDoContentManager = new ToDoContentManager(); + var ToDoListManager = new ToDoListManager(); + ToDoContentManager.start(); + ToDoListManager.start(); +}); diff --git a/homework/test/test-list.js b/homework/test/test-list.js index 441fc45..a1a53b3 100644 --- a/homework/test/test-list.js +++ b/homework/test/test-list.js @@ -1,8 +1,17 @@ describe('Test > ', function() { + var subject; beforeEach(function() { + subject = new ToDoListManager(); }); it('will test some pure functions', function() { // Write any pure function assertion here. + var test = subject; + var sum = test.puerFunction(1,4); + assert.equal(sum,5,'It is equal to 5!'); }); + + Manager.prototype.puerFunction(a,b){ + return a+b; + } });