Merge pull request #8 from anag0/dev-0.2.0

0.2.0 Final
ernestmarcinko · Jun 13, 2023 · 8df4b4e · 8df4b4e
2 parents 92b2745 + d863823
commit 8df4b4e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 11 deletions.
diff --git a/dist/domini-serialize.js b/dist/domini-serialize.js
diff --git a/dist/domini-xhttp.js b/dist/domini-xhttp.js
diff --git a/dist/domini.js b/dist/domini.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "domini",
-    "version": "0.1.2",
+    "version": "0.2.0",
     "description": "Minimalistic DOM manipulation tool",
     "main": "dist/domini.js",
     "scripts": {

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-# DoMini
+# [DoMini](https://dominijs.com) &middot; ![npm](https://img.shields.io/npm/v/domini) ![npm](https://img.shields.io/npm/dy/domini) ![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)
 
 A minimalistic HTML document manipulation and traversal tool. Syntactically indentical to jQuery, but much smaller with only the essential features.
 

diff --git a/src/modules/serialize.js b/src/modules/serialize.js
@@ -62,15 +62,15 @@ DoMini.fn.serialize = function() {
     }
     return q.join("&");
 };
-DoMini.fn.serializeForAjax = function(obj, prefix) {
+DoMini.fn.serializeObject = function(obj, prefix) {
     let str = [],
         p;
     for (p in obj) {
         if (obj.hasOwnProperty(p)) {
             let k = prefix ? prefix + "[" + p + "]" : p,
                 v = obj[p];
             str.push((v !== null && typeof v === "object") ?
-            DoMini.fn.serializeForAjax(v, k) :
+            DoMini.fn.serializeObject(v, k) :
                 encodeURIComponent(k) + "=" + encodeURIComponent(v));
         }
     }

diff --git a/src/modules/viewport.js b/src/modules/viewport.js
@@ -1,5 +1,6 @@
 import DoMini from "../base";
 
+// Inspired by: https://github.com/zeusdeux/isInViewport
 DoMini.fn.inViewPort = function (tolerance, viewport) {
     "use strict";
     let element = this.get(0), vw, vh;

diff --git a/src/modules/xhttp.js b/src/modules/xhttp.js
@@ -29,14 +29,14 @@ DoMini.fn.ajax = function(args) {
         args.data.fn = fn;
         let script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = args.url + '?' + this.serializeForAjax(args.data);
+        script.src = args.url + '?' + this.serializeObject(args.data);
         script.onload = function(){this.remove();};
         document.body.appendChild(script);
     } else {
         let xhttp = new XMLHttpRequest();
         xhttp.onreadystatechange = function() {
             if ( args.success != null ) {
-                if ( this.readyState == 4 && this.status == 200 ) {
+                if ( this.readyState == 4 && (this.status >= 200 && this.status < 400) ) {
                     args.success(this.responseText);
                 }
             }
@@ -51,7 +51,7 @@ DoMini.fn.ajax = function(args) {
         xhttp.setRequestHeader('Content-type', args.contentType);
         xhttp.setRequestHeader('Accept', args.accept);
 
-        xhttp.send(this.serializeForAjax(args.data));
+        xhttp.send(this.serializeObject(args.data));
         return xhttp;
     }
 };

diff --git a/test/modules/xhttp.js b/test/modules/xhttp.js
@@ -5,11 +5,12 @@ QUnit.module("module: xhttp.js tests", function(hooks) {
         f.innerHTML = fixture;
     });
 
-    QUnit.test('xhttp()', function(assert) {
+    QUnit.test('xhttp() cors', function(assert) {
         const done = assert.async();
         let data = {
             'options': $('form[name=testform]').serialize()
         };
+        // Cors
         $.fn.ajax({
             "url": "/request",
             "method": "POST",
@@ -20,4 +21,30 @@ QUnit.module("module: xhttp.js tests", function(hooks) {
             }
         });
     });
+
+    QUnit.test('xhttp() no-cors', function(assert) {
+        const done = assert.async();
+        // No-Cors
+        DoMini.fn.ajax({
+            url: 'https://clients1.google.com/complete/search',
+            cors: 'no-cors',
+            data: {
+                q: 'us',
+                hl: 'en',
+                nolabels: 't',
+                client: 'hp',
+                ds: ''
+            },
+            success: function (data) {
+                if (data[1].length > 0) {
+                    let response = data[1][0][0].replace(/(<([^>]+)>)/ig, "");
+                    response = DoMini('<textarea />').html(response).text();
+                    console.log(response);
+                    assert.notEqual(response, '');
+                    assert.notEqual(response, 'us');
+                    done();
+                }
+            }
+        });
+    });
 });