From 8c1bfad4fe27cef3289db141858e354bccc517f3 Mon Sep 17 00:00:00 2001 From: amm040341 Date: Fri, 23 Oct 2015 21:13:32 +0800 Subject: [PATCH 1/3] homework_ver1 --- homework/content.js | 51 ++++++++++++--------- homework/index.html | 1 + homework/list.js | 105 +++++++++++++++++++++++++------------------- homework/main.js | 8 ++++ 4 files changed, 99 insertions(+), 66 deletions(-) create mode 100644 homework/main.js diff --git a/homework/content.js b/homework/content.js index 710be28..2eda002 100644 --- a/homework/content.js +++ b/homework/content.js @@ -1,21 +1,18 @@ '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) { - function resetWrapper() { - _wrapper.innerHTML = ''; - } +var ContentManager = function() { + var _wrapper = null; +}; + +ContentManager.prototype = { - function drawNote(note) { + resetWrapper() { + this._wrapper.innerHTML = ''; + }, + + drawNote(note) { var title = note.title; var h = document.createElement('h2'); h.textContent = title; @@ -27,11 +24,25 @@ p.textContent = passage; buff.appendChild(p); }); - _wrapper.appendChild(h); - _wrapper.appendChild(buff); + this._wrapper.appendChild(h); + this._wrapper.appendChild(buff); + }, + + handleEvent(event) { + switch(event.type) { + case 'note-open': + var note = event.detail; + this.resetWrapper(); + this.drawNote(note); + break; + } + }, + + start() { + this._wrapper = document.querySelector('#note-content-wrapper'); + window.addEventListener('note-open', this); } +}; - document.addEventListener('DOMContentLoaded', function(event) { - start(); - }); -})(); +exports.ContentManager = ContentManager; +})(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..5f5265c 100644 --- a/homework/list.js +++ b/homework/list.js @@ -1,44 +1,37 @@ 'use strict'; -(function() { +(function(exports) { +var ListManager = function() { var _listNoteContent = []; - var _wrapper = document.querySelector('#note-list-wrapper'); + var _wrapper = null; +}; - function start() { - fetchList(function(data) { - updateList(data); - drawList(); - preloadFirstNote(); - }); - window.addEventListener('click', function(event) { - onNoteOpen(event); - }); - } +ListManager.prototype = { - 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 +45,48 @@ 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(url) { + return new Promise(function(reslove, reject) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', url, 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. + reslove(listData); + } else if (this.status !== 200 ){ + reject(new Error('FETCHING FAILED: ' + this.status + ' ' + this.readyState)); + } + }).bind(xhr); + xhr.send(); + }); + }, - document.addEventListener('DOMContentLoaded', function(event) { - start(); - }); + handleEvent(event) { + switch(event.type) { + case 'click': + this.onNoteOpen(event); + break; + } + }, + + start() { + this._wrapper = document.querySelector('#note-list-wrapper'); + this.fetchList('./demo-list-notes.json').then((function(response) { + this.updateList(response); + this.drawList(); + this.preloadFirstNote(); + }).bind(this)).catch(function(error){ + console.error(error); + }); + window.addEventListener('click', this); + } +}; -})(); +exports.ListManager = ListManager; +})(window); diff --git a/homework/main.js b/homework/main.js new file mode 100644 index 0000000..d647e23 --- /dev/null +++ b/homework/main.js @@ -0,0 +1,8 @@ +'use strict'; + +document.addEventListener('DOMContentLoaded', function(event) { + var contentManager = new ContentManager(); + var listManager = new ListManager(); + contentManager.start(); + listManager.start(); +}); From 7a4672a4c2324e308e66a6474faa0ec629bab06d Mon Sep 17 00:00:00 2001 From: amm040341 Date: Fri, 23 Oct 2015 21:53:20 +0800 Subject: [PATCH 2/3] homework_ver2--add test --- homework/test/test-list.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/homework/test/test-list.js b/homework/test/test-list.js index 441fc45..d1f5b3c 100644 --- a/homework/test/test-list.js +++ b/homework/test/test-list.js @@ -1,8 +1,13 @@ -describe('Test > ', function() { - beforeEach(function() { - }); +describe('Test Math.sin', function() { + var subject; + + beforeEach(function() { + subject = new TestManager; + }); - it('will test some pure functions', function() { - // Write any pure function assertion here. + it('will test sin function', function() { + subject.set(Math.PI); + assertEqual(subject.sin(),0,"pass!!"); + done(); }); }); From 6705670f25aa857dd894e43fef3812dd92e568b6 Mon Sep 17 00:00:00 2001 From: amm040341 Date: Sat, 24 Oct 2015 21:09:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?homework=5Fver3-=E4=BF=AE=E6=94=B9Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homework/test/test-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homework/test/test-list.js b/homework/test/test-list.js index d1f5b3c..2c6a0ab 100644 --- a/homework/test/test-list.js +++ b/homework/test/test-list.js @@ -7,7 +7,7 @@ describe('Test Math.sin', function() { it('will test sin function', function() { subject.set(Math.PI); - assertEqual(subject.sin(),0,"pass!!"); + assertEqual(subject.sin(),0); done(); }); });