diff --git a/homework/content.js b/homework/content.js
index 710be28..edb5c47 100644
--- a/homework/content.js
+++ b/homework/content.js
@@ -1,37 +1,42 @@
'use strict';
-(function() {
- var _wrapper = document.querySelector('#note-content-wrapper');
+(function(exports) {
- function start() {
- window.addEventListener('note-open', function(event) {
- var note = event.detail;
- resetWrapper();
- drawNote(note);
- });
- }
+ var ContentManager = function() {
+ this._wrapper = null;
+ };
- function resetWrapper() {
- _wrapper.innerHTML = '';
- }
+ ContentManager.prototype = {
+ start() {
+ this._wrapper = document.querySelector('#note-content-wrapper');
+ window.addEventListener('note-open', this);
+ /*(function(event) {
+ var note = event.detail;
+ resetWrapper();
+ 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 = '';
+ },
- document.addEventListener('DOMContentLoaded', function(event) {
- start();
- });
-})();
+ 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);
+ }
+ }
+ 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..eae250f 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');
+ var ListManager = function() {
+ var _listNoteContent = [];
+ var _wrapper = null; };
- function start() {
- fetchList(function(data) {
- updateList(data);
- drawList();
- preloadFirstNote();
- });
- window.addEventListener('click', function(event) {
- onNoteOpen(event);
- });
- }
+ ListManager.prototype = {
+ start() {
+ this._wrapper = document.querySelector('#note-list-wrapper');
+ this.fetchList().then((function(data) {
+ this.updateList(data);
+ this.drawList();
+ this.preloadFirstNote();
+ }).bind(this));
- 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 }));
- };
- }
+ window.addEventListener('click', (function(event) {
+ this.onNoteOpen(event);
+ }).bind(this));
+ },
- function preloadFirstNote() {
- if (_listNoteContent.length !== 0) {
- var content = _listNoteContent[0];
- window.dispatchEvent(new CustomEvent('note-open',
- { detail: content }));
- }
- }
-
- function updateList(list) {
- _listNoteContent = list;
- }
-
- 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);
- }
+ 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 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();
- }
+ },
- document.addEventListener('DOMContentLoaded', function(event) {
- start();
- });
+ updateList(list) {
+ this._listNoteContent = list;
+ },
-})();
+ 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(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.
+ resolve(listData);
+ } else if (this.status !== 200 ){
+ // Ignore error in this case.
+ reject(xhr);
+ }
+ };
+ xhr.send();
+ }).bind(this));
+ }
+ };
+ exports.ListManager = ListManager;
+})(window);
diff --git a/homework/main.js b/homework/main.js
new file mode 100644
index 0000000..20ea539
--- /dev/null
+++ b/homework/main.js
@@ -0,0 +1,8 @@
+'use strict';
+
+document.addEventListener('DOMContentLoaded', function(event) {
+ var listManager = new ListManager();
+ var contentManager = new ContentManager();
+ listManager.start();
+ contentManager.start();
+});
diff --git a/homework/test/test-list.js b/homework/test/test-list.js
index 441fc45..f3f77f8 100644
--- a/homework/test/test-list.js
+++ b/homework/test/test-list.js
@@ -1,8 +1,14 @@
describe('Test > ', function() {
+ var sub;
beforeEach(function() {
+ sub = new ContentManager();
});
- it('will test some pure functions', function() {
+ it('test reset wrapper', function() {
// Write any pure function assertion here.
+ sub._wrapper = document.createElement('p');
+ sub._wrapper.innerHTML = "G_G";
+ sub.resetWrapper();
+ assert.equal(sub._wrapper.innerHTML , "" ,"Fail！")
});
});