diff --git a/homework/content.js b/homework/content.js
index 710be28..502133b 100644
--- a/homework/content.js
+++ b/homework/content.js
@@ -1,21 +1,24 @@
'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');
}
+
+ ContentManager.prototype = {
+ start() {
+ window.addEventListener('note-open', (function(event) {
+ var note = event.detail;
+ this.resetWrapper();
+ this.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 +30,12 @@
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) {
+ };
+ /* document.addEventListener('DOMContentLoaded', function(event) {
start();
- });
-})();
+ });*/
+exports.ContentManager = ContentManager;
+})(window);
diff --git a/homework/index.html b/homework/index.html
index e387963..bc34924 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..3c1937a 100644
--- a/homework/list.js
+++ b/homework/list.js
@@ -1,44 +1,51 @@
'use strict';
-(function() {
+(function(exports) {
- var _listNoteContent = [];
- var _wrapper = document.querySelector('#note-list-wrapper');
+var ListManager = function() {
+ this._listNoteContent = [];
+ this._wrapper =document.querySelector('#note-list-wrapper');
+};
- function start() {
- fetchList(function(data) {
- updateList(data);
- drawList();
- preloadFirstNote();
- });
- window.addEventListener('click', function(event) {
- onNoteOpen(event);
- });
- }
+ListManager.prototype = {
+
+ start() {
+ this.fetchList().then((function(response) {
+ this.updateList(response);
+ this.drawList();
+ this.preloadFirstNote();
+ }).bind(this)).catch((function() {
+ }).bind(this));
+
+
+ window.addEventListener('click', (function(event) {
+ this.onNoteOpen(event);
+ }).bind(this));
+ },
- 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 +59,31 @@
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) {
+ 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) {
+ // 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 ){
+ resolve(listData);
+ } else if (this.status !== 200 ){
+ reject('FETCHING FAILED: ' + this.status + ' ' + this.readyState);
// Ignore error in this case.
- }
+ }
};
xhr.send();
+ }).bind(this));
}
+};
+
+exports.ListManager = ListManager;
+})(window);
- document.addEventListener('DOMContentLoaded', function(event) {
- start();
- });
-})();
diff --git a/homework/main.js b/homework/main.js
new file mode 100644
index 0000000..4093d65
--- /dev/null
+++ b/homework/main.js
@@ -0,0 +1,9 @@
+'use strict';
+
+ // Kick off
+document.addEventListener('DOMContentLoaded', function(event) {
+ var listManager = new ListManager();
+ var contentManager = new ContentManager();
+ listManager.start();
+ contentManager.start();
+});
\ No newline at end of file
diff --git a/homework/test/test-list.js b/homework/test/test-list.js
index 441fc45..a339f3a 100644
--- a/homework/test/test-list.js
+++ b/homework/test/test-list.js
@@ -4,5 +4,6 @@ describe('Test > ', function() {
it('will test some pure functions', function() {
// Write any pure function assertion here.
+ assert.equal(1+2, 3);
});
});