Implemented Promises interface

pinceladasdaweb · Sep 25, 2017 · f5150b1 · f5150b1
1 parent f7fa1f8
commit f5150b1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/build/tweetlight.min.js b/build/tweetlight.min.js
diff --git a/src/tweetlight.js b/src/tweetlight.js
@@ -52,27 +52,37 @@
                 counter  = this.counter ? '&count=' + this.counter : '',
                 endpoint = this.endpoint + '?' + type + counter;
 
-            this.getJSON(endpoint, this.loadTweets.bind(this), this.failure.bind(this));
+            this.getJSON(endpoint).then(this.loadTweets.bind(this), this.failure.bind(this));
         },
-        getJSON: function (path, success, fail) {
-            var xhttp = new XMLHttpRequest();
-
-            xhttp.open('GET', path, true);
-            xhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-            xhttp.setRequestHeader('Content-type', 'application/json');
-            xhttp.onreadystatechange = function () {
-                if (this.readyState === 4) {
-                    if ((this.status >= 200 && this.status < 300) || this.status === 304) {
-                        var response = JSON.parse(this.responseText);
-
-                        success.call(this, response);
-                    } else {
-                        fail.call(this, this.status + ' - ' + this.statusText);
+        getJSON: function (path) {
+            return new Promise(function(resolve, reject) {
+                var xhttp = new XMLHttpRequest();
+
+                xhttp.open('GET', path, true);
+                xhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                xhttp.setRequestHeader('Content-type', 'application/json');
+                xhttp.onreadystatechange = function () {
+                    if (this.readyState === 4) {
+                        if ((this.status >= 200 && this.status < 300) || this.status === 304) {
+                            var response = JSON.parse(this.responseText);
+
+                            resolve(response);
+                        } else {
+                            var error = this.statusText;
+
+                            reject('Http/App Error: ' + error);
+                        }
                     }
                 }
-            };
-            xhttp.send();
-            xhttp = null;
+                xhttp.onerror = processError;
+                xhttp.onabort = processError;
+                xhttp.send();
+                xhttp = null;
+
+                function processError (err) {
+                    reject('Network Error: ' + err.target.status);
+                }
+            });
         },
         loadTweets: function (tweets) {
             var apiStatus = tweets.httpstatus;