From ba62f6088feb2fbbb9fb2313637fe2207f8facda Mon Sep 17 00:00:00 2001 From: tsayen Date: Wed, 22 Apr 2015 20:26:26 +0200 Subject: [PATCH] append loaded html to body instead of full reload --- spec/domvas.spec.js | 19 ++++--- spec/resources/regression-simple.html | 78 ++++++++++++--------------- 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/spec/domvas.spec.js b/spec/domvas.spec.js index 8b87c9f1..eac6ada6 100644 --- a/spec/domvas.spec.js +++ b/spec/domvas.spec.js @@ -8,23 +8,30 @@ describe('domvas', function () { }); it('should render simple css correctly', function (done) { - loadHtml('regression-simple.html').then(function (html) { - document.write(html); + loadHtml('regression-simple.html').then(function () { var dom_node = $('#dom-node')[0]; console.log('hey! ' + dom_node); done(); }); }); - function loadHtml(path) { - return new Promise(function (resolve) { + function loadHtml(fileName) { + return new Promise(function (resolve, reject) { + var url = '/base/spec/resources/' + fileName; var request = new XMLHttpRequest(); console.log('request ' + request); - request.open('GET', '/base/spec/resources/' + path, true); + request.open('GET', url, true); request.responseType = 'text/html'; + request.onload = function () { - if (this.status == 200) resolve(request.response.toString()); + if (this.status == 200) { + var content = document.createElement('div'); + content.innerHTML = request.response.toString(); + $('body')[0].appendChild(content); + resolve(); + }; }; + request.send(); }); } diff --git a/spec/resources/regression-simple.html b/spec/resources/regression-simple.html index b061dc24..61110e89 100644 --- a/spec/resources/regression-simple.html +++ b/spec/resources/regression-simple.html @@ -1,49 +1,37 @@ - - + - +.red { + background-color: red; +} - -
-
-
-
-
- +.green { + background-color: green; +} - +.blue { + background-color: blue; +} + +.red, +.green, +.blue { + height: 33.333333%; + width: 100%; + border: 1px solid lightgrey; + border-radius: 6px; +} + +
+
+
+
+