From db7227e197882d283a399d58c0c2fac9f802697f Mon Sep 17 00:00:00 2001
From: jakub-g <jakub.g.opensource@gmail.com>
Date: Fri, 19 Sep 2014 17:42:26 +0200
Subject: [PATCH] feat(syntax) mandatory `<script>` tag for JS content

---
 build/grunt/docs.js                        |  2 +-
 docs/playground/layout.hsp                 |  4 ++++
 docs/playground/splitter.hsp               |  5 ++++-
 docs/samples/clickhandler/clickhandler.hsp |  4 ++++
 docs/samples/clock/clock.hsp               |  4 ++++
 docs/samples/component1/timer.hsp          |  5 ++++-
 docs/samples/component2/nbrfield.hsp       | 11 ++++++++++-
 docs/samples/component3/pagination.hsp     |  4 ++++
 docs/samples/conditions/conditions.hsp     |  6 ++++++
 docs/samples/cssclass/cssclass.hsp         |  2 ++
 docs/samples/dynpath/dynpath.hsp           |  2 ++
 docs/samples/dyntemplates/dyntemplates.hsp |  2 ++
 docs/samples/gestures/gestures.hsp         |  4 ++++
 docs/samples/global/global.hsp             |  6 ++++++
 docs/samples/helloworld/hello.hsp          |  5 +++++
 docs/samples/inputsample/inputsample.hsp   |  2 ++
 docs/samples/let/let.hsp                   |  2 ++
 docs/samples/list1/list.hsp                |  9 +++++++++
 docs/samples/list2/list.hsp                |  8 ++++++++
 docs/samples/listsorting/list.hsp          |  2 ++
 docs/samples/listupdate/list.hsp           |  2 ++
 docs/samples/logs/logs.hsp                 |  4 ++++
 docs/samples/modifiers/modifiers.hsp       |  4 ++++
 docs/samples/panel/panel.hsp               |  6 ++++++
 docs/samples/simplelist/simplelist.hsp     |  2 ++
 docs/samples/subtemplates/subtemplates.hsp |  2 ++
 docs/samples/tabbar/tabbar.hsp             |  4 ++++
 docs/samples/textarea/textarea.hsp         |  2 ++
 docs/samples/thirdpartycpts/chart.hsp      |  5 ++++-
 docs/samples/timer/timer.hsp               |  4 ++++
 docs/samples/todolist/todolist.hsp         |  4 ++++
 gruntfile.js                               |  3 ++-
 hsp/compiler/jsgenerator/index.js          |  6 ++++--
 hsp/compiler/parser/hspblocks.pegjs        | 20 ++++++++++++++++----
 test/compiler/errsamples/mixed1.txt        |  4 ++++
 test/compiler/errsamples/mixed2.txt        |  2 ++
 test/compiler/errsamples/mixed2v2.txt      | 14 ++++++++++++++
 test/compiler/errsamples/mixed3.txt        |  8 ++++++--
 test/compiler/errsamples/mixed4.txt        | 12 +++++++++---
 test/compiler/errtests.js                  | 14 ++++++++++----
 test/compiler/samples/class1.txt           |  4 ----
 test/compiler/samples/jsexpression1.txt    |  3 +--
 test/compiler/samples/template1.txt        | 16 ++++++++++++++--
 test/compiler/samples/text4.txt            |  8 --------
 test/compiler/samples/text7.txt            |  2 ++
 test/compiler/samples/text8.txt            |  2 ++
 test/compiler/tests.js                     | 16 +++++++++++-----
 test/gestures/doubleTap.spec.hsp           |  4 ++++
 test/gestures/drag.spec.hsp                |  4 ++++
 test/gestures/longPress.spec.hsp           |  4 ++++
 test/gestures/pinch.spec.hsp               |  4 ++++
 test/gestures/singleTap.spec.hsp           |  4 ++++
 test/gestures/swipe.spec.hsp               |  4 ++++
 test/gestures/tap.spec.hsp                 |  4 ++++
 test/rt/attributes/class.spec.hsp          |  6 +++++-
 test/rt/attributes/modelvalue.spec.hsp     |  6 ++++++
 test/rt/booleanAttributes.spec.hsp         |  6 +++++-
 test/rt/cptattelements1.spec.hsp           |  8 +++++++-
 test/rt/cptattelements2.spec.hsp           |  6 ++++--
 test/rt/cptattelements3.spec.hsp           |  6 ++++--
 test/rt/cptattelements4.spec.hsp           |  7 ++++++-
 test/rt/cptattelements5.spec.hsp           |  5 ++++-
 test/rt/cptbinding.spec.hsp                |  6 ++++++
 test/rt/cptinit.spec.hsp                   |  5 ++++-
 test/rt/cptintegration.spec.hsp            |  6 ++++--
 test/rt/cptrefresh.spec.hsp                |  5 ++++-
 test/rt/cptwrapper.spec.hsp                |  9 ++++++++-
 test/rt/customAttributes.spec.hsp          |  6 +++++-
 test/rt/dynexpressions.spec.hsp            |  4 ++++
 test/rt/elt.spec.hsp                       | 11 ++++++++---
 test/rt/evthandler.spec.hsp                |  7 ++++---
 test/rt/exprbinding.spec.hsp               |  4 ++++
 test/rt/filescope.spec.hsp                 |  5 ++++-
 test/rt/fnexpressions.spec.hsp             |  6 ++++++
 test/rt/foreach.spec.hsp                   | 10 +++++++++-
 test/rt/foreach_globals.spec.hsp           |  4 ++++
 test/rt/global.spec.hsp                    |  6 ++++--
 test/rt/if.spec.hsp                        |  6 ++++--
 test/rt/let.spec.hsp                       |  5 ++++-
 test/rt/log.spec.hsp                       |  7 +++++--
 test/rt/subtemplates1.spec.hsp             |  7 ++++++-
 test/rt/subtemplates2.spec.hsp             | 10 +++++++++-
 test/rt/subtemplates3.spec.hsp             |  6 ++++--
 test/rt/svg.spec.hsp                       |  6 +++++-
 test/rt/text.spec.hsp                      | 17 +++++++++++++++--
 test/utils/eventgenerator.spec.hsp         |  6 +++++-
 test/utils/hashtester.spec.hsp             |  4 ++++
 87 files changed, 428 insertions(+), 80 deletions(-)
 create mode 100644 test/compiler/errsamples/mixed2v2.txt

diff --git a/build/grunt/docs.js b/build/grunt/docs.js
index 46ccc9c..2d8a5b4 100644
--- a/build/grunt/docs.js
+++ b/build/grunt/docs.js
@@ -409,7 +409,7 @@ module.exports = function(grunt) {
           process: function(content) {
             var compiled = renderer.renderString(content, "inline.js");
             if (compiled.serverErrors && compiled.serverErrors.length) {
-              grunt.fail.fatal("Hashspace compilation " + compiled.serverErrors[0].description);
+              grunt.fail.fatal("\r\nHashspace compilation of " + file + "\r\n" + compiled.serverErrors[0].description);
               return false;
             }
             return compiled.code;
diff --git a/docs/playground/layout.hsp b/docs/playground/layout.hsp
index 8060be1..0a6dbb0 100644
--- a/docs/playground/layout.hsp
+++ b/docs/playground/layout.hsp
@@ -1,3 +1,4 @@
+<script>
 var splitter = require("./splitter.hsp.js");
 var plunkerExport = require("./plunker.js");
 
@@ -28,6 +29,7 @@ var DescriptionCtrl = Class({
         this.after = parts[1];
     }
 });
+</script>
 
 <template desc using ctrl:DescriptionCtrl>
     <div id="description">
@@ -69,6 +71,7 @@ var DescriptionCtrl = Class({
     </div>
 </template>
 
+<script>
 function splitterReleased(position, data, playground) {
     data.splitterPos = position + "px";
     editorResize(playground);
@@ -100,6 +103,7 @@ function hideNavHover(event, data) {
         data.navHover = false;
     }
 }
+</script>
 
 <template sampleList(data, playground)>
     <div class="samples-list {{'samples-list-collapsed': data.navCollapsed}}"
diff --git a/docs/playground/splitter.hsp b/docs/playground/splitter.hsp
index 62fd532..848f0f1 100644
--- a/docs/playground/splitter.hsp
+++ b/docs/playground/splitter.hsp
@@ -1,3 +1,4 @@
+<script>
 var Class = require("hsp/klass");
 
 var SplitterCtrl = Class({
@@ -71,11 +72,13 @@ var SplitterCtrl = Class({
         element.style[this.type === "vertical" ? "top" : "left"] = position + "px";
     }
 });
-
+</script>
 
 <template splitter using controller:SplitterCtrl>
     <div class="splitter" onmousedown="{controller.onMouseDown(event)}"></div>
     <div class="splitter-proxy {{'splitter-proxy-hidden': !controller.active}}"></div>
 </template>
 
+<script>
 module.exports = splitter;
+</script>
diff --git a/docs/samples/clickhandler/clickhandler.hsp b/docs/samples/clickhandler/clickhandler.hsp
index 785d858..bf50ac8 100644
--- a/docs/samples/clickhandler/clickhandler.hsp
+++ b/docs/samples/clickhandler/clickhandler.hsp
@@ -1,4 +1,6 @@
+<script>
 var msg={text:""}, count=-1;
+</script>
 
 <template message(msg)>
     <div title="click me!" onclick="{changeMessage()}" onselectstart="return false">
@@ -7,6 +9,7 @@ var msg={text:""}, count=-1;
     </div>
 </template>
 
+<script>
 function changeMessage() {
     count++;
     switch(count%3) {
@@ -36,3 +39,4 @@ module.exports = {
     template: message,
     data: [msg]
 };
+</script>
diff --git a/docs/samples/clock/clock.hsp b/docs/samples/clock/clock.hsp
index 65a622c..3168c0d 100644
--- a/docs/samples/clock/clock.hsp
+++ b/docs/samples/clock/clock.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 var CITIES={
@@ -41,6 +42,7 @@ var ClockController=klass({
 		this.cityName = CITIES[this.city].city;
 	}
 });
+</script>
 
 <template clock using c:ClockController>
 	// example from http://www.ractivejs.org/examples/clock/
@@ -75,8 +77,10 @@ var ClockController=klass({
 	<#clock city="TYO"/>
 </template>
 
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
     template: demo
 };
+</script>
diff --git a/docs/samples/component1/timer.hsp b/docs/samples/component1/timer.hsp
index 2dee7f9..fc79f45 100644
--- a/docs/samples/component1/timer.hsp
+++ b/docs/samples/component1/timer.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // klass is a utility to create JS objects with constructors & prototypes
@@ -16,6 +17,7 @@ var Timer=klass({
       this.secondsElapsed++;
     }
 });
+</script>
 
 <template timer using t:Timer>
     Elapsed time: {t.secondsElapsed}s
@@ -27,9 +29,10 @@ var Timer=klass({
   <#timer initvalue="10"/>
 </template>
 
-
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
     template: test
 };
+</script>
diff --git a/docs/samples/component2/nbrfield.hsp b/docs/samples/component2/nbrfield.hsp
index 6265428..a2e77f5 100644
--- a/docs/samples/component2/nbrfield.hsp
+++ b/docs/samples/component2/nbrfield.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // Component controller
@@ -68,8 +69,12 @@ function getNumber(s) {
     if (!NBR_DIGITS.test(s)) return null;
     return Number(s);
 }
+</script>
 
+<script>
 // component template associated with the NbrField controller
+</script>
+
 <export template nbrfield using c:NbrField>
   <span class="nbrfield">
     <input type="text" model="{c.internalValue}"
@@ -78,7 +83,10 @@ function getNumber(s) {
   </span>
 </template>
 
+<script>
 // component usage
+</script>
+
 <template test(d)>
   Component #1: <#nbrfield value="{d.value1}" min="-10" max="1000"/><br/>
   Value in the data model: <span class="textValue">{d.value1}</span>
@@ -88,10 +96,11 @@ function getNumber(s) {
   Value in the data model: <span class="textValue">{d.value2}</span>
 </template>
 
-
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
     template: test,
     data: [{ value1 : 123 }]
 };
+</script>
diff --git a/docs/samples/component3/pagination.hsp b/docs/samples/component3/pagination.hsp
index fd0ca08..5274cfb 100644
--- a/docs/samples/component3/pagination.hsp
+++ b/docs/samples/component3/pagination.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 function calculateNoOfPages(collectionSize, pageSize) {
@@ -42,6 +43,7 @@ var Pagination=klass({
        rebuildInternalModel(this);
     }
 });
+</script>
 
 <template pagination using p:Pagination>
     <ul class="pagination">
@@ -71,6 +73,7 @@ var Pagination=klass({
 
 </template>
 
+<script>
 var model = {
     active: 4,
     collectionSize: 99,
@@ -88,3 +91,4 @@ module.exports = {
     template: paginationTest,
     data: [model]
 };
+</script>
diff --git a/docs/samples/conditions/conditions.hsp b/docs/samples/conditions/conditions.hsp
index 3bf7476..84ed8d6 100644
--- a/docs/samples/conditions/conditions.hsp
+++ b/docs/samples/conditions/conditions.hsp
@@ -1,6 +1,10 @@
+<script>
 var klass=require("hsp/klass");
+</script>
 
+<script>
 // nt is an instance of NumberTester
+</script>
 <template test(nt)>
     <div>
         Number: <span class="textvalue">{nt.number}</span>
@@ -23,6 +27,7 @@ var klass=require("hsp/klass");
     </div>
 </template>
 
+<script>
 // klass is a little utility to create a JS object constructor
 // from a simple JSON structure - main goals are to
 // to simplify prototypal inheritance and ease code reading
@@ -44,3 +49,4 @@ module.exports = {
         return [new NumberTester()];
     }
 };
+</script>
diff --git a/docs/samples/cssclass/cssclass.hsp b/docs/samples/cssclass/cssclass.hsp
index 8e1b8c6..5228118 100644
--- a/docs/samples/cssclass/cssclass.hsp
+++ b/docs/samples/cssclass/cssclass.hsp
@@ -13,6 +13,7 @@
     </div>
 </template>
 
+<script>
 var msg={
     text:"Hello World",
     urgency:false
@@ -32,3 +33,4 @@ module.exports = {
     template: message,
     data: [msg]
 };
+</script>
\ No newline at end of file
diff --git a/docs/samples/dynpath/dynpath.hsp b/docs/samples/dynpath/dynpath.hsp
index c828a68..5588b00 100644
--- a/docs/samples/dynpath/dynpath.hsp
+++ b/docs/samples/dynpath/dynpath.hsp
@@ -18,6 +18,7 @@
     <a href="javascript:void(0)" onclick="{swapC()}">Show/Hide columns C</a>
 </template>
 
+<script>
 // create dummy data
 var list=[], count=5;
 for (var i=0;count>i;i++) {
@@ -57,3 +58,4 @@ module.exports = {
     template: grid,
     data: [model]
 };
+</script>
diff --git a/docs/samples/dyntemplates/dyntemplates.hsp b/docs/samples/dyntemplates/dyntemplates.hsp
index bb67f06..cca6824 100644
--- a/docs/samples/dyntemplates/dyntemplates.hsp
+++ b/docs/samples/dyntemplates/dyntemplates.hsp
@@ -15,6 +15,7 @@
   </div>
 </template>
 
+<script>
 var model={
     view: tplA,
     msg: "Hello World",
@@ -33,3 +34,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>
\ No newline at end of file
diff --git a/docs/samples/gestures/gestures.hsp b/docs/samples/gestures/gestures.hsp
index c4ed7ea..88d866d 100644
--- a/docs/samples/gestures/gestures.hsp
+++ b/docs/samples/gestures/gestures.hsp
@@ -1,4 +1,6 @@
+<script>
 require('hsp/gestures/index').register();
+</script>
 
 <template gestures(msgList)>
     <div class="touchboard" style="height:200px; background: #27AAFC;text-align:center;"
@@ -19,6 +21,7 @@ require('hsp/gestures/index').register();
     </div>
 </template>
 
+<script>
 var eventLog = [];
 
 function addMsg(evt) {
@@ -36,3 +39,4 @@ module.exports = {
     template: gestures,
     data: [eventLog]
 };
+</script>
diff --git a/docs/samples/global/global.hsp b/docs/samples/global/global.hsp
index 2339646..89a3183 100644
--- a/docs/samples/global/global.hsp
+++ b/docs/samples/global/global.hsp
@@ -1,4 +1,6 @@
+<script>
 var hsp=require("hsp/rt");
+</script>
 
 <template item(text,value)>
     {if value}
@@ -9,8 +11,10 @@ var hsp=require("hsp/rt");
     {/if}
 </template>
 
+<script>
 hsp.global.label=item;
 hsp.global.ln={personDetails:"Person details"};
+</script>
 
 <template test(person)>
     <div class="global" title="{ln.personDetails}">
@@ -19,6 +23,7 @@ hsp.global.ln={personDetails:"Person details"};
     </div>
 </template>
 
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
@@ -28,3 +33,4 @@ module.exports = {
         lastName:"Simpson"
     }]
 };
+</script>
diff --git a/docs/samples/helloworld/hello.hsp b/docs/samples/helloworld/hello.hsp
index 39af818..d916fa6 100644
--- a/docs/samples/helloworld/hello.hsp
+++ b/docs/samples/helloworld/hello.hsp
@@ -1,13 +1,18 @@
+<script>
 // edit me!
+</script>
+
 <template hello(name)>
     <div class="msg">
         Hello {name}!
     </div>
 </template>
 
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
   template: hello,
   data: ["World"]
 };
+</script>
\ No newline at end of file
diff --git a/docs/samples/inputsample/inputsample.hsp b/docs/samples/inputsample/inputsample.hsp
index 7bd2032..3e5319f 100644
--- a/docs/samples/inputsample/inputsample.hsp
+++ b/docs/samples/inputsample/inputsample.hsp
@@ -31,6 +31,7 @@
     </div>
 </template>
 
+<script>
 var d={comment:"edit me!", isChecked:false, selection:"B", dtype:"text"}
 
 // Needed by the playground application.
@@ -39,3 +40,4 @@ module.exports = {
     template: inputSample,
     data: [d]
 };
+</script>
diff --git a/docs/samples/let/let.hsp b/docs/samples/let/let.hsp
index 508e012..7868aed 100644
--- a/docs/samples/let/let.hsp
+++ b/docs/samples/let/let.hsp
@@ -13,6 +13,7 @@
   <a href="javascript:void(0)" onclick="{updateModel()}">Change Model</a>
 </template>
 
+<script>
 var model={
   part1:{
     part11: {msg: "Message 1.1"}
@@ -35,3 +36,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>
\ No newline at end of file
diff --git a/docs/samples/list1/list.hsp b/docs/samples/list1/list.hsp
index f821539..9ce68d5 100644
--- a/docs/samples/list1/list.hsp
+++ b/docs/samples/list1/list.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // simple list controller
@@ -12,8 +13,12 @@ var ListController = klass({
     "separator": {type:"template"}
   }
 });
+</script>
 
+<script>
 // simple list template
+</script>
+
 <template list using lc:ListController>
   // content is the list of attribute sub-elements
   <div class="list {lc.class}">
@@ -36,7 +41,9 @@ var ListController = klass({
   </div>
 </template>
 
+<script>
 // test template
+</script>
 <template test(d)>
   <#list head="Static list" class="listcpt">
     <@option>First {d.itemName}</@option>
@@ -60,6 +67,7 @@ var ListController = klass({
   </#list>
 </template>
 
+<script>
 var count=0, model={
   itemName: "item",
   preferredOption:"My favourite things",
@@ -87,3 +95,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>
diff --git a/docs/samples/list2/list.hsp b/docs/samples/list2/list.hsp
index f41ae32..73d3756 100644
--- a/docs/samples/list2/list.hsp
+++ b/docs/samples/list2/list.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // simple option controller
@@ -34,8 +35,11 @@ var ListCtrl = klass({
     this.onselect({value:value});
   }
 });
+</script>
 
+<script>
 // simple list template
+</script>
 <template list using lc:ListCtrl>
   // content is the list of attribute sub-elements
   <div class="list {lc.class}">
@@ -60,7 +64,9 @@ var ListCtrl = klass({
   </div>
 </template>
 
+<script>
 // test template
+</script>
 <template test(d)>
   Click on an item to select it:
 
@@ -83,6 +89,7 @@ var ListCtrl = klass({
   {if d.selectedItem!==null}Last selected value: {d.selectedItem}{/if}
 </template>
 
+<script>
 var count=0, model={
   itemName: "item",
   items:["Kind of blue","Something else","Winter moon"]
@@ -109,3 +116,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>
diff --git a/docs/samples/listsorting/list.hsp b/docs/samples/listsorting/list.hsp
index 87bf01c..f3f5299 100644
--- a/docs/samples/listsorting/list.hsp
+++ b/docs/samples/listsorting/list.hsp
@@ -26,6 +26,7 @@
     </div>
 </template>
 
+<script>
 var people = [
     {name:"Homer", age:38},
     {name:"Marge", age:38},
@@ -40,3 +41,4 @@ module.exports = {
     template: list,
     data: [people]
 };
+</script>
diff --git a/docs/samples/listupdate/list.hsp b/docs/samples/listupdate/list.hsp
index 31959f1..a0e7671 100644
--- a/docs/samples/listupdate/list.hsp
+++ b/docs/samples/listupdate/list.hsp
@@ -20,6 +20,7 @@
     </div>
 </template>
 
+<script>
 var persons=[
     {firstName:"Homer",lastName:"Simpsons"},
     {firstName:"Marge",lastName:"Simpsons"},
@@ -59,3 +60,4 @@ module.exports = {
     template: list,
     data: [persons]
 };
+</script>
diff --git a/docs/samples/logs/logs.hsp b/docs/samples/logs/logs.hsp
index 7a90800..bd938ba 100644
--- a/docs/samples/logs/logs.hsp
+++ b/docs/samples/logs/logs.hsp
@@ -1,4 +1,6 @@
+<script>
 var log=require("hsp/rt/log");
+</script>
 
 <template test(cities, logs)>
   {log "top-level:",scope}
@@ -24,6 +26,7 @@ var log=require("hsp/rt/log");
   </div>
 </template>
 
+<script>
 // register new logger
 var logs=[];
 log.addLogger(function(msg) {
@@ -56,3 +59,4 @@ module.exports = {
     template: test,
     data: [cities, logs]
 };
+</script>
diff --git a/docs/samples/modifiers/modifiers.hsp b/docs/samples/modifiers/modifiers.hsp
index 56b0e01..59c01a4 100644
--- a/docs/samples/modifiers/modifiers.hsp
+++ b/docs/samples/modifiers/modifiers.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 function changeCase(s,arg) {
@@ -36,6 +37,7 @@ var Sorter=klass({
         this.ascending=!this.ascending;
     }
 })
+</script>
 
 <template sample(d)>
     <div class="section2">
@@ -60,6 +62,7 @@ var Sorter=klass({
     </div>
 </template>
 
+<script>
 var data={
     msg:"Hello Simpsons!",
     persons:[
@@ -78,3 +81,4 @@ module.exports = {
     template: sample,
     data: [data]
 };
+</script>
diff --git a/docs/samples/panel/panel.hsp b/docs/samples/panel/panel.hsp
index 82b2b0f..baf963e 100644
--- a/docs/samples/panel/panel.hsp
+++ b/docs/samples/panel/panel.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 var PanelController = klass({
@@ -6,8 +7,11 @@ var PanelController = klass({
     "body":{type:"template",defaultContent:true}
   }
 });
+</script>
 
+<script>
 // sample panel template
+</script>
 <template panel using c:PanelController>
   <div class="panel">
     {if c.head}
@@ -32,6 +36,7 @@ var PanelController = klass({
   </#panel>
 </template>
 
+<script>
 var model={text:"Hello World"}, count=0;
 
 function update(incr) {
@@ -45,3 +50,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>
diff --git a/docs/samples/simplelist/simplelist.hsp b/docs/samples/simplelist/simplelist.hsp
index 5b05f07..745b115 100644
--- a/docs/samples/simplelist/simplelist.hsp
+++ b/docs/samples/simplelist/simplelist.hsp
@@ -14,6 +14,7 @@
     </div>
 </template>
 
+<script>
 function toggleDetails(person) {
     person.showdetails = !person.showdetails;
 }
@@ -34,3 +35,4 @@ module.exports = {
     template: people,
     data: [d]
 };
+</script>
diff --git a/docs/samples/subtemplates/subtemplates.hsp b/docs/samples/subtemplates/subtemplates.hsp
index 37ec832..351e30d 100644
--- a/docs/samples/subtemplates/subtemplates.hsp
+++ b/docs/samples/subtemplates/subtemplates.hsp
@@ -25,6 +25,7 @@
     {/if}
 </template>
 
+<script>
 var persons=[
     {firstName:"Homer",lastName:"Simpsons"},
     {firstName:"Marge",lastName:"Simpsons"},
@@ -40,3 +41,4 @@ module.exports = {
     template: personList,
     data: [persons]
 };
+</script>
diff --git a/docs/samples/tabbar/tabbar.hsp b/docs/samples/tabbar/tabbar.hsp
index 372a2ed..4a65785 100644
--- a/docs/samples/tabbar/tabbar.hsp
+++ b/docs/samples/tabbar/tabbar.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass = require("hsp/klass");
 
 var TabCtrl = klass({
@@ -42,6 +43,7 @@ var TabBarCtrl = klass({
         }
     }
 });
+</script>
 
 <template tabbar using ctrl:TabBarCtrl>
   <div class="x-tabbar">
@@ -89,8 +91,10 @@ var TabBarCtrl = klass({
   </label>
 </template>
 
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
     template: test
 };
+</script>
diff --git a/docs/samples/textarea/textarea.hsp b/docs/samples/textarea/textarea.hsp
index 66a340f..bfaf153 100644
--- a/docs/samples/textarea/textarea.hsp
+++ b/docs/samples/textarea/textarea.hsp
@@ -11,6 +11,7 @@
     <a href="javascript:void(0)" onclick="{changeText(data)}">Change text</a>
 </template>
 
+<script>
 var d={
     // Frog by Donna Shepherd
     text:"    @..@\n   (----)\n  ( >__< )\n ^^ ~~ ^^"
@@ -31,3 +32,4 @@ module.exports = {
     template: sample,
     data: [d]
 };
+</script>
diff --git a/docs/samples/thirdpartycpts/chart.hsp b/docs/samples/thirdpartycpts/chart.hsp
index 17df679..7c11192 100644
--- a/docs/samples/thirdpartycpts/chart.hsp
+++ b/docs/samples/thirdpartycpts/chart.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass"), log=require("hsp/rt/log");
 
 var labels=["January","February","March","April","May","June","July"];
@@ -39,6 +40,7 @@ var ChartCpt=klass({
     }
   }
 });
+</script>
 
 <template chart using c:ChartCpt>
   <canvas width="{c.width}" height="{c.height}"></canvas>
@@ -59,7 +61,7 @@ var ChartCpt=klass({
   </div>
 </template>
 
-
+<script>
 // Needed by the playground application.
 // Update it, but do not remove it!
 module.exports = {
@@ -69,3 +71,4 @@ module.exports = {
       ds:"d1"
     }]
 };
+</script>
diff --git a/docs/samples/timer/timer.hsp b/docs/samples/timer/timer.hsp
index 00b024d..7d6debf 100644
--- a/docs/samples/timer/timer.hsp
+++ b/docs/samples/timer/timer.hsp
@@ -1,9 +1,12 @@
+<script>
 var klass=require("hsp/klass");
+</script>
 
 <template elapsedTime(timer)>
     Seconds Elapsed: {timer.secondsElapsed}
 </template>
 
+<script>
 // klass is a little utility to create a JS object constructor
 // from a simple JSON structure - main goals are to
 // to simplify prototypal inheritance and ease code reading
@@ -28,3 +31,4 @@ module.exports = {
         return [new Timer()];
     }
 };
+</script>
diff --git a/docs/samples/todolist/todolist.hsp b/docs/samples/todolist/todolist.hsp
index 3b6f021..941f0b1 100644
--- a/docs/samples/todolist/todolist.hsp
+++ b/docs/samples/todolist/todolist.hsp
@@ -1,4 +1,6 @@
+<script>
 var klass=require("hsp/klass");
+</script>
 
 <template todolist(todo)>
     <div>
@@ -15,6 +17,7 @@ var klass=require("hsp/klass");
     </div>
 </template>
 
+<script>
 // todo controller
 var TodoCtl=klass({
     $constructor:function() {
@@ -41,3 +44,4 @@ module.exports = {
     template: todolist,
     data: [ctrl]
 };
+</script>
diff --git a/gruntfile.js b/gruntfile.js
index ad1a397..2e154af 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -23,7 +23,7 @@ module.exports = function (grunt) {
       test: {
         options: {
           reporter: 'spec',
-          require: 'build/blanket'
+          require: 'build/blanket' // comment this line out to disable coverage when debugging mocha tests
         },
         src: [
           'test/compiler/**/*.js',
@@ -173,6 +173,7 @@ module.exports = function (grunt) {
       },
       unit: {
         singleRun: true
+        // logLevel: 'DEBUG' // uncomment for investigating hashspace precompilation issues
       },
       tdd: {
         singleRun: false,
diff --git a/hsp/compiler/jsgenerator/index.js b/hsp/compiler/jsgenerator/index.js
index d994258..47d88c8 100644
--- a/hsp/compiler/jsgenerator/index.js
+++ b/hsp/compiler/jsgenerator/index.js
@@ -53,7 +53,9 @@ exports.generate = function(res, template, fileName, dirPath, options) {
             res.codeFragments = templateWalker.templates;
         }
 
-        res.code = HEADER + out.join('\r\n');
+        // don't add any newlines when joining blocks;
+        // emit necessary newlines from the parser or template walker instead
+        res.code = HEADER + out.join('');
         res.errors = templateWalker.errors;
     } else {
         // Generate a JS script to show the errors when the generated file is loaded
@@ -159,7 +161,7 @@ function _generateLineMap (res, file) {
         }
     }
 
-    var nbrOfLinesInCompiledTemplate = 7; //all generated templates got fixed no of LOC
+    var nbrOfLinesInCompiledTemplate = 5; //all generated templates got fixed no of LOC
     var lineMap = [], pos = HEADER_SZ, template;
     var pos1 = -1; // position of the next template start
     var pos2 = -1; // position of the next template end
diff --git a/hsp/compiler/parser/hspblocks.pegjs b/hsp/compiler/parser/hspblocks.pegjs
index 9ab2e1c..80d9194 100644
--- a/hsp/compiler/parser/hspblocks.pegjs
+++ b/hsp/compiler/parser/hspblocks.pegjs
@@ -7,13 +7,25 @@
  * with hashspace constraints)
  * @see https://github.com/dmajda/pegjs
  */
-
 TemplateFile
-  = blocks:(TemplateBlock / TextBlock)* 
-  {return blocks;}
+  = blocks:(TemplateBlock / ScriptBlock / TopLevelWhitespace)*
+  {
+   return blocks;
+  }
+
+TopLevelWhitespace
+  = lines:(chars:WhiteSpace* eol:EOL {return chars.join("") + eol})+
+    {return {type:"plaintext", value:lines.join('')}}
+
+ScriptBlock "script block"
+  = (_ "<script>" eol1:EOL? content:TextBlock "</script>" _ eol2:(EOL / EOF))
+  {
+    content.value = (eol1 || "") + content.value + (eol2 || "");
+    return content;
+  }
 
 TextBlock
-  = lines:(!(_ ("<") _ "template") !(_ ("<") _ [a-zA-Z0-9]+ _ "template") !("#" _ "require") chars:[^\n\r]* eol:EOL {return chars.join("")+eol})+
+  = lines:(!(_ ("<") ("template" / "/script")) !(_ ("<") _ [a-zA-Z0-9]+ _ "template") !("#" _ "require") chars:[^\n\r]* eol:EOL {return chars.join("")+eol})+
   {return {type:"plaintext", value:lines.join('')}}
 
 TemplateBlock "template block"
diff --git a/test/compiler/errsamples/mixed1.txt b/test/compiler/errsamples/mixed1.txt
index f9ed5c4..9f27b6e 100644
--- a/test/compiler/errsamples/mixed1.txt
+++ b/test/compiler/errsamples/mixed1.txt
@@ -1,8 +1,10 @@
 ##### Template:
+<script>
 var x=23;
 function foo() {
     return x;
 }
+</script>
 
 <template test(person)>
     <div title="Some text" id="{person.id}" class="{person.gender} {person.category}">
@@ -10,8 +12,10 @@ function foo() {
     </div>
 </template>
 
+<script>
 function bar() {
     foo({blah:"hello",});
 }
+</script>
 
 ##### Errors:
diff --git a/test/compiler/errsamples/mixed2.txt b/test/compiler/errsamples/mixed2.txt
index 3f91f7a..032e814 100644
--- a/test/compiler/errsamples/mixed2.txt
+++ b/test/compiler/errsamples/mixed2.txt
@@ -1,8 +1,10 @@
 ##### Template:
+<script>
 .var x=23;
 function foo() {
     return x;
 }
+</script>
 
 <template test(person)>
     <div title="Some text" id="{person.id}" class="{person.gender} {person.category}">
diff --git a/test/compiler/errsamples/mixed2v2.txt b/test/compiler/errsamples/mixed2v2.txt
new file mode 100644
index 0000000..796598a
--- /dev/null
+++ b/test/compiler/errsamples/mixed2v2.txt
@@ -0,0 +1,14 @@
+##### Template:
+<script>.var x=23;
+function foo() {
+    return x;
+}
+</script>
+
+<template test(person)>
+    <div title="Some text" id="{person.id}" class="{person.gender} {person.category}">
+        <span>Hello {person.name}!</span>
+    </div>
+</template>
+
+##### Errors:
diff --git a/test/compiler/errsamples/mixed3.txt b/test/compiler/errsamples/mixed3.txt
index c6303d6..1e932ea 100644
--- a/test/compiler/errsamples/mixed3.txt
+++ b/test/compiler/errsamples/mixed3.txt
@@ -1,11 +1,15 @@
 ##### Template:
-// line 1
+<script>
+// line 2
+</script>
 <template test(person)>
     <div title="Some text" id="{person.id}" class="{person.gender} {person.category}">
         <span>Hello {person.name}!</span>
     </div>
 </template>
-// line 7
+<script>
+// line 10
 .var foo=42;
+</script>
 
 ##### Errors:
diff --git a/test/compiler/errsamples/mixed4.txt b/test/compiler/errsamples/mixed4.txt
index dbc1e83..f922cd0 100644
--- a/test/compiler/errsamples/mixed4.txt
+++ b/test/compiler/errsamples/mixed4.txt
@@ -1,16 +1,22 @@
 ##### Template:
-// line 1
+<script>
+// line 2
+</script>
 <template test(person)>
     <div title="Some text" id="{person.id}" class="{person.gender} {person.category}">
         <span>Hello {person.name}!</span>
     </div>
 </template>
-// line 7
+<script>
+// line 10
 var foo=42;
+</script>
 <template bar>
     Hello
 </template>
-// line 12
+<script>
+// line 17
 .
+</script>
 
 ##### Errors:
diff --git a/test/compiler/errtests.js b/test/compiler/errtests.js
index d699aab..8c95844 100644
--- a/test/compiler/errtests.js
+++ b/test/compiler/errtests.js
@@ -40,7 +40,7 @@ describe('Template compilation errors: ', function () {
                 '\r\n',
                 'require("hsp/rt/log").error(',
                     '"SyntaxError: Unexpected token",',
-                    '{"type":"error","file":"mixed1","code":"    foo({blah:\\"hello\\",});","line":13,"column":22}',
+                    '{"type":"error","file":"mixed1","code":"    foo({blah:\\"hello\\",});","line":16,"column":22}',
                 ');\r\n'
         ].join('');
         assert.equal(r.code, s, "generated code");
@@ -50,19 +50,25 @@ describe('Template compilation errors: ', function () {
     it('tests mixed errors in template and JS script 2', function () {
         var sample = ut.getErrorSampleContent("mixed2");
         var r = compiler.compile(sample.template, "mixed2");
-      assert.equal(r.errors[0].line, 1, "error line 1");
+        assert.equal(r.errors[0].line, 2);
+    });
+
+    it('tests mixed errors in template and JS script 2 without newline', function () {
+        var sample = ut.getErrorSampleContent("mixed2v2");
+        var r = compiler.compile(sample.template, "mixed2v2");
+        assert.equal(r.errors[0].line, 1);
     });
 
     it('tests mixed errors in template and JS script 3', function () {
         var sample = ut.getErrorSampleContent("mixed3");
         var r = compiler.compile(sample.template, "mixed3");
-        assert.equal(r.errors[0].line, 8);
+        assert.equal(r.errors[0].line, 11);
     });
 
     it('tests mixed errors in template and JS script 4', function () {
         var sample = ut.getErrorSampleContent("mixed4");
         var r = compiler.compile(sample.template, "mixed4");
-        assert.equal(r.errors[0].line, 13);
+        assert.equal(r.errors[0].line, 18);
     });
 
 });
diff --git a/test/compiler/samples/class1.txt b/test/compiler/samples/class1.txt
index 5da0164..ffc8ae3 100644
--- a/test/compiler/samples/class1.txt
+++ b/test/compiler/samples/class1.txt
@@ -52,10 +52,6 @@
         ]
       }
     ]
-  },
-  {
-    "type": "plaintext",
-    "value": "\r\n"
   }
 ]
 
diff --git a/test/compiler/samples/jsexpression1.txt b/test/compiler/samples/jsexpression1.txt
index 07b62a7..c490bcd 100644
--- a/test/compiler/samples/jsexpression1.txt
+++ b/test/compiler/samples/jsexpression1.txt
@@ -42,8 +42,7 @@
         ]
       }
     ]
-  },
-  {"type": "plaintext","value": "\r\n"}
+  }
 ]
     
 ##### Template Code
diff --git a/test/compiler/samples/template1.txt b/test/compiler/samples/template1.txt
index e5a2b7c..0807107 100644
--- a/test/compiler/samples/template1.txt
+++ b/test/compiler/samples/template1.txt
@@ -1,27 +1,36 @@
 ##### Template:
+<script>
 var x="text1";
 function func() {var x="text2"};
+</script>
 
 <template hello1>
    Hello World!
 </template>
 
+<script>
 // comment
 function func2(z) {return z;}
+</script>
 
 <template hello1bis (arg1, arg2)>
 	Hello
 	Again!
 </template>
+<script>
 var z;
+</script>
 ##### Parsed Tree:
 
 [ 
-  { type: 'plaintext', value: 'var x=\"text1\";\nfunction func() {var x=\"text2\"};\n\n'},
+  { type: 'plaintext', value: '\nvar x=\"text1\";\nfunction func() {var x=\"text2\"};\n\n'},
+  { type: 'plaintext', value: '\n'},
   { type: 'template', name: 'hello1', args: [], content: [
     { type: 'text', value: 'Hello World!' } 
   ]},
+  { type: 'plaintext', value: '\n'},
   { type: 'plaintext', value: '\n// comment\nfunction func2(z) {return z;}\n\n'},
+  { type: 'plaintext', value: '\n'},
   { type: 'template', name: 'hello1bis', args: [ 'arg1', 'arg2' ], content: [
     { type: 'text', value: 'Hello Again!' } 
   ]}
@@ -30,11 +39,14 @@ var z;
 ##### Syntax Tree:
 
 [ 
-  { type: 'plaintext', value: 'var x=\"text1\";\nfunction func() {var x=\"text2\"};\n\n'},
+  { type: 'plaintext', value: '\nvar x=\"text1\";\nfunction func() {var x=\"text2\"};\n\n'},
+  { type: 'plaintext', value: '\n'},
   { type: 'template', name: 'hello1', args: [], content: [
     { type: 'text', value: 'Hello World!' } 
   ]},
+  { type: 'plaintext', value: '\n'},
   { type: 'plaintext', value: '\n// comment\nfunction func2(z) {return z;}\n\n'},
+  { type: 'plaintext', value: '\n'},
   { type: 'template', name: 'hello1bis', args: [ 'arg1', 'arg2' ], content: [
     { type: 'text', value: 'Hello Again!' } 
   ]}
diff --git a/test/compiler/samples/text4.txt b/test/compiler/samples/text4.txt
index 81c3f93..128847f 100644
--- a/test/compiler/samples/text4.txt
+++ b/test/compiler/samples/text4.txt
@@ -29,10 +29,6 @@
       }
     ],
     "closed": true
-  },
-  {
-    "type": "plaintext",
-    "value": "\r\n"
   }
 ]
 
@@ -67,10 +63,6 @@
         ]
       }
     ]
-  },
-  {
-    "type": "plaintext",
-    "value": "\r\n"
   }
 ]
 
diff --git a/test/compiler/samples/text7.txt b/test/compiler/samples/text7.txt
index 65bde5f..42eeff9 100644
--- a/test/compiler/samples/text7.txt
+++ b/test/compiler/samples/text7.txt
@@ -1,5 +1,7 @@
 ##### Template:
+<script>
 var person = {name : "World"};
+</script>
 <template hello()>
 	Hello {person.name}!
 </template>
diff --git a/test/compiler/samples/text8.txt b/test/compiler/samples/text8.txt
index ba9d84a..d4356ad 100644
--- a/test/compiler/samples/text8.txt
+++ b/test/compiler/samples/text8.txt
@@ -1,5 +1,7 @@
 ##### Template:
+<script>
 var nullValue = "null";
+</script>
 
 <template main()>
     before-{nullValue}-after
diff --git a/test/compiler/tests.js b/test/compiler/tests.js
index db477e4..4dad5e7 100644
--- a/test/compiler/tests.js
+++ b/test/compiler/tests.js
@@ -19,21 +19,27 @@ describe('Block Parser: ', function () {
 
     it('tests testutils.getContent', function () {
         var tpl = ut.getSampleContent("template1").template;
-        var expectedCode = ['var x="text1";',
+        var expectedCode = ['<script>',
+                'var x="text1";',
                 'function func() {var x="text2"};',
+                '</script>',
                 '',
                 '<template hello1>',
                 '   Hello World!',
                 '</template>',
                 '',
+                '<script>',
                 '// comment',
                 'function func2(z) {return z;}',
+                '</script>',
                 '',
                 '<template hello1bis (arg1, arg2)>',
                 '\tHello',
                 '\tAgain!',
                 '</template>',
-                'var z;'].join("\n");
+                '<script>',
+                'var z;',
+                '</script>'].join("\n");
 
         var actualCode = tpl.replace(/\r/g, "");
         assertCodeTheSame(actualCode, expectedCode, "sample content");
@@ -52,6 +58,7 @@ describe('Block Parser: ', function () {
 
     var testFn = function () {
         var sample = ut.getSampleContent(this.name);
+
         var bl = parser.parse(sample.template);
         var skip = (sample.parsedTree && sample.parsedTree === "skip");
         if (!skip) {
@@ -68,7 +75,6 @@ describe('Block Parser: ', function () {
             includeSyntaxTree: true,
             bypassJSvalidation: true
         });
-
         skip = (sample.syntaxTree && sample.syntaxTree === "skip");
         if (!skip) {
             if (sample.syntaxTree) {
@@ -173,7 +179,7 @@ describe('Block Parser: ', function () {
         var actualCode = r.code.replace(/\r/g, "");
         assertCodeTheSame(actualCode, expectedCode, "template generated code");
 
-        var lm = [0, 6, 7, 8, 9, 9, 9, 16, 17, 18, 19, 20, 20, 20, 20, 27];
+        var lm = [0, 6, 7, 8, 9, 10, 11, 11, 11, 16, 17, 18, 19, 20, 21, 22, 22, 22, 22, 27, 28, 29];
         // console.log("Expected linemap");
         // console.log(lm);
         // console.log("Real linemap");
@@ -208,7 +214,7 @@ describe('Block Parser: ', function () {
         assertCodeTheSame(actualCode, expectedCode, "template generated code");
 
         // linemap should be the same as in commonJS mode test
-        var lm = [0, 6, 7, 8, 9, 9, 9, 16, 17, 18, 19, 20, 20, 20, 20, 27];
+        var lm = [0, 6, 7, 8, 9, 10, 11, 11, 11, 16, 17, 18, 19, 20, 21, 22, 22, 22, 22, 27, 28, 29];
         assert.equal(ut.jsonContains(r.lineMap, lm, "lineMap"), "", "line map comparison");
     });
 
diff --git a/test/gestures/doubleTap.spec.hsp b/test/gestures/doubleTap.spec.hsp
index dab0ce1..399fbf2 100644
--- a/test/gestures/doubleTap.spec.hsp
+++ b/test/gestures/doubleTap.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/doubleTap").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" ondoubletap="{ctl.handleEvent(event)}" ondoubletapstart="{ctl.handleEvent(event)}" ondoubletapcancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("DoubleTap gesture", function () {
 
     function validate(expected, result) {
@@ -170,3 +173,4 @@ describe("DoubleTap gesture", function () {
     
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/drag.spec.hsp b/test/gestures/drag.spec.hsp
index 42dd00d..b02aead 100644
--- a/test/gestures/drag.spec.hsp
+++ b/test/gestures/drag.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/drag").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" ondrag="{ctl.handleEvent(event)}" ondragstart="{ctl.handleEvent(event)}" ondragmove="{ctl.handleEvent(event)}" ondragcancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("Drag gesture", function () {
 
     function validate(expected, result) {
@@ -119,3 +122,4 @@ describe("Drag gesture", function () {
     });
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/longPress.spec.hsp b/test/gestures/longPress.spec.hsp
index 9edab38..c6d2a5a 100644
--- a/test/gestures/longPress.spec.hsp
+++ b/test/gestures/longPress.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/longPress").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" onlongpress="{ctl.handleEvent(event)}" onlongpressstart="{ctl.handleEvent(event)}" onlongpresscancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("LongPress gesture", function () {
     function validate(expected, result) {
         expect(expected.length).to.equal(result.length);
@@ -152,3 +155,4 @@ describe("LongPress gesture", function () {
     });
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/pinch.spec.hsp b/test/gestures/pinch.spec.hsp
index 1aee986..a7dcd0f 100644
--- a/test/gestures/pinch.spec.hsp
+++ b/test/gestures/pinch.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/pinch").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" onpinch="{ctl.handleEvent(event)}" onpinchstart="{ctl.handleEvent(event)}" onpinchmove="{ctl.handleEvent(event)}" onpinchcancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("Pinch gesture", function () {
 
     function validate(expected, result) {
@@ -215,3 +218,4 @@ describe("Pinch gesture", function () {
     });
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/singleTap.spec.hsp b/test/gestures/singleTap.spec.hsp
index 46c2f6e..82eae0e 100644
--- a/test/gestures/singleTap.spec.hsp
+++ b/test/gestures/singleTap.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/singleTap").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" onsingletap="{ctl.handleEvent(event)}" onsingletapstart="{ctl.handleEvent(event)}" onsingletapcancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("SingleTap gesture", function () {
 
     function validate(expected, result) {
@@ -188,3 +191,4 @@ describe("SingleTap gesture", function () {
     
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/swipe.spec.hsp b/test/gestures/swipe.spec.hsp
index 31ac1b8..08967e6 100644
--- a/test/gestures/swipe.spec.hsp
+++ b/test/gestures/swipe.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/swipe").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" onswipe="{ctl.handleEvent(event)}" onswipestart="{ctl.handleEvent(event)}" onswipemove="{ctl.handleEvent(event)}" onswipecancel="{ctl.handleEvent(event)}">
@@ -27,6 +29,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("Swipe gesture", function () {
 
     function validate(expected, result) {
@@ -145,3 +148,4 @@ describe("Swipe gesture", function () {
     });
 
 });
+</script>
\ No newline at end of file
diff --git a/test/gestures/tap.spec.hsp b/test/gestures/tap.spec.hsp
index 65fd251..8cfb53b 100644
--- a/test/gestures/tap.spec.hsp
+++ b/test/gestures/tap.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@
 require("hsp/gestures/tap").register();
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
+</script>
 
 <template test1(ctl)>
     <div title="test1" ontap="{ctl.handleTap(event)}" ontapstart="{ctl.handleTap(event)}" ontapcancel="{ctl.handleTap(event)}">
@@ -30,6 +32,7 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("Tap gesture", function () {
 
     function validate(expected, result) {
@@ -153,3 +156,4 @@ describe("Tap gesture", function () {
     });
 
 });
+</script>
\ No newline at end of file
diff --git a/test/rt/attributes/class.spec.hsp b/test/rt/attributes/class.spec.hsp
index ef0f5d4..e5613bc 100644
--- a/test/rt/attributes/class.spec.hsp
+++ b/test/rt/attributes/class.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +16,7 @@
 
 var hsp = require("hsp/rt");
 var $set = require('hsp/$set');
+</script>
 
 <template test1(model)>
     <div class="test"></div>
@@ -24,6 +26,7 @@ var $set = require('hsp/$set');
     <div class="base {model.more}"></div>
 </template>
 
+<script>
 describe("Class attribute", function () {
 
     it("tests various class definitions", function () {
@@ -81,4 +84,5 @@ describe("Class attribute", function () {
         expect(n.node.childNodes[2].className).to.equal("base active extra extras");
         n.$dispose();
     });
-});
\ No newline at end of file
+});
+</script>
diff --git a/test/rt/attributes/modelvalue.spec.hsp b/test/rt/attributes/modelvalue.spec.hsp
index c417631..1ffb75c 100644
--- a/test/rt/attributes/modelvalue.spec.hsp
+++ b/test/rt/attributes/modelvalue.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +18,7 @@ var hsp=require("hsp/rt"),
     fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     json=require("hsp/json"),
     ht=require("hsp/utils/hashtester");
+</script>
 
 <template inputSample(data)>
     <div class="info section">All the following inputs are synchronized:</div>
@@ -54,6 +56,7 @@ var hsp=require("hsp/rt"),
     <div><input type="number" model="{model.value}"/></div>
 </template>
 
+<script>
 describe("Input Elements", function () {
     it("input model sync", function () {
         var v1 = "init value";
@@ -234,11 +237,13 @@ describe("Input Elements", function () {
         var n = html5NumberInput({value: 5});
     });
 });
+</script>
 
 <template test1(data)>
     <textarea rows="4" cols="40"  model="{data.text}"/>
 </template>
 
+<script>
 // normalize carriage returns to avoid OS discrepancies
 function normalizeCR(s) {
     return s.replace(/\r\n|[\r\n]/gi,"\n");
@@ -263,3 +268,4 @@ describe("Textarea Elements", function () {
         h.$dispose();
     });
 });
+</script>
diff --git a/test/rt/booleanAttributes.spec.hsp b/test/rt/booleanAttributes.spec.hsp
index 23db512..bd73115 100644
--- a/test/rt/booleanAttributes.spec.hsp
+++ b/test/rt/booleanAttributes.spec.hsp
@@ -1,11 +1,14 @@
+<script>
 var json=require("hsp/json");
 hsp=require("hsp/rt");
+</script>
 
 <template tpl(model)>
 <input type = "text" required = "{model.flag}">
 <input type = "radio" checked = "{model.flag2}">
 </template>
 
+<script>
 describe('boolean attributes', function () {
 
     it('should add / remove boolean attributes with truthy / falsy values', function () {
@@ -27,4 +30,5 @@ describe('boolean attributes', function () {
 
         n.$dispose();
     });
-});
\ No newline at end of file
+});
+</script>
diff --git a/test/rt/cptattelements1.spec.hsp b/test/rt/cptattelements1.spec.hsp
index d49b85f..830318e 100644
--- a/test/rt/cptattelements1.spec.hsp
+++ b/test/rt/cptattelements1.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2013 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,8 @@ PanelController = klass({
 });
 
 // sample panel template
+</script>
+
 <template panel using c:PanelController>
   <div class="panel">
     {if c.head}
@@ -100,11 +102,13 @@ PanelController = klass({
   </div>
 </template>
 
+<script>
 var TestCtl=klass({
       attributes:{
         "value":{type:"string",binding:"1-way"}
     }
 })
+</script>
 
 <template item using c:TestCtl>
     Value: {c.value}
@@ -116,6 +120,7 @@ var TestCtl=klass({
   </div>
 </template>
 
+<script>
 var HEAD=".panel .head";
 var BODY=".panel .body";
 
@@ -303,3 +308,4 @@ describe("Component attribute elements (1)", function () {
   // test that template attriubte can be created/deleted dynamically
 
 });
+</script>
diff --git a/test/rt/cptattelements2.spec.hsp b/test/rt/cptattelements2.spec.hsp
index f476bf2..4494e8a 100644
--- a/test/rt/cptattelements2.spec.hsp
+++ b/test/rt/cptattelements2.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2013 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +36,7 @@ var ExpandCollapseController = klass({
         $set(this, "visible", false);
     }
 });
+</script>
 
 <template expandCollapse using c:ExpandCollapseController>
     {if c.visible}
@@ -52,7 +53,7 @@ var ExpandCollapseController = klass({
     </#expandCollapse>
 </template>
 
-
+<script>
 var LINK="a";
 var CONTENT=".content";
 
@@ -79,3 +80,4 @@ describe("Component attribute elements (2)", function () {
   });
 
 });
+</script>
diff --git a/test/rt/cptattelements3.spec.hsp b/test/rt/cptattelements3.spec.hsp
index 780ee92..c41d1c7 100644
--- a/test/rt/cptattelements3.spec.hsp
+++ b/test/rt/cptattelements3.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2013 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@ var ListController = klass({
         option: {type:"template"} //, maxOccurence:1 ?
     }
 });
+</script>
 
 <template list using lc:ListController>
     {if !lc.content} 
@@ -79,7 +80,7 @@ var ListController = klass({
 </template>
 
 
-
+<script>
 var EMPTY_MSG=".nodata";
 var OPTIONS="ul .opt";
 
@@ -188,3 +189,4 @@ describe("Component attribute elements (3)", function () {
     // check 3 possible types of elements (template/element/component)
 
 });
+</script>
diff --git a/test/rt/cptattelements4.spec.hsp b/test/rt/cptattelements4.spec.hsp
index 58badf5..81e60d3 100644
--- a/test/rt/cptattelements4.spec.hsp
+++ b/test/rt/cptattelements4.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,6 +45,7 @@ var ListCtrl = klass({
         lastSelectionValue=value;
     }
 });
+</script>
 
 <template list using lc:ListCtrl>
     {if !lc.content} 
@@ -86,6 +87,7 @@ var ListCtrl = klass({
   {tab.title}
 </template>
 
+<script>
 var TabCtrl = klass({
   $init: function () {
     this.tabs = [{title:"Tab A", template: tabA},{title:"Tab B"}];
@@ -99,6 +101,7 @@ var TabCtrl = klass({
     }
   }
 });
+</script>
 
 <template tabs using c:TabCtrl>
   <ul class="nav nav-tabs">
@@ -115,6 +118,7 @@ var TabCtrl = klass({
   </ul>
 </template>
 
+<script>
 var EMPTY_MSG=".nodata";
 var OPTIONS="ul .opt";
 
@@ -236,3 +240,4 @@ describe("Component attribute elements (4)", function () {
     // TODO validate that parent is passed to controller $init
 
 });
+</script>
diff --git a/test/rt/cptattelements5.spec.hsp b/test/rt/cptattelements5.spec.hsp
index e1ef5b4..025ff4f 100644
--- a/test/rt/cptattelements5.spec.hsp
+++ b/test/rt/cptattelements5.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,6 +56,7 @@ var TabBarCtrl = klass({
         }
     }
 });
+</script>
 
 <template tabbar using ctrl:TabBarCtrl>
   <div class="x-tabbar">
@@ -100,6 +101,7 @@ var TabBarCtrl = klass({
   </#tabbar>
 </template>
 
+<script>
 var TABS=".x-tab";
 var BODY=".x-tab-content";
 
@@ -168,3 +170,4 @@ describe("Component attribute elements (5)", function () {
     // TODO: support empty att template - and consider it generates an empty string..
 
 });
+</script>
diff --git a/test/rt/cptbinding.spec.hsp b/test/rt/cptbinding.spec.hsp
index a97b530..1d96c26 100644
--- a/test/rt/cptbinding.spec.hsp
+++ b/test/rt/cptbinding.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass"),
     hsp=require("hsp/rt"),
     fireEvent=require("hsp/utils/eventgenerator").fireEvent,
@@ -29,6 +30,7 @@ var Cpt1 = klass({
     this.onDefaultValueChangeCount++;
   }
 });
+</script>
 
 <template cpt1 using c:Cpt1>
   <input type="text" value="{c.value}"/>
@@ -41,6 +43,7 @@ var Cpt1 = klass({
   <input type="text" value="{d.defaultvalue}"/>
 </template>
 
+<script>
 var checks=[], lastInitValue=null, dataValue=null;
 var Cpt2 = klass({ 
   attributes:{ 
@@ -59,6 +62,7 @@ var Cpt2 = klass({
     checks.push({n:newValue,o:oldValue});
   }
 });
+</script>
 
 <template cpt2 using c:Cpt2>
   <input type="text" value="{c.value}"/>
@@ -72,6 +76,7 @@ var Cpt2 = klass({
   <#cpt2 value="{d.value}" data="{d.data}"/>
 </template>
 
+<script>
 var setFieldValue=function(field,value) {
   // helper function
   field.value=""+value;
@@ -186,3 +191,4 @@ describe("Component attributes binding", function () {
   });
 
 });
+</script>
diff --git a/test/rt/cptinit.spec.hsp b/test/rt/cptinit.spec.hsp
index 2ef2237..8497ae3 100644
--- a/test/rt/cptinit.spec.hsp
+++ b/test/rt/cptinit.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +26,7 @@ var TestCtrl=klass({
     this.oninit();
   }
 });
+</script>
 
 <template cpt using c:TestCtrl>
     <div class="cpt">{c.value}</div>
@@ -61,6 +62,7 @@ var TestCtrl=klass({
     <#ctxt.tpl data="{d}"/>
 </template>
 
+<script>
 var Model=klass({
   $constructor:function(v) {
     this.show=false;
@@ -135,3 +137,4 @@ describe("Component init special cases", function () {
     });
 
 });
+</script>
diff --git a/test/rt/cptintegration.spec.hsp b/test/rt/cptintegration.spec.hsp
index 6eccd8a..87b915f 100644
--- a/test/rt/cptintegration.spec.hsp
+++ b/test/rt/cptintegration.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,6 +40,7 @@ var TestCtrl1=klass({
     }
   }
 });
+</script>
 
 <template test1 using c:TestCtrl1>
   Hello
@@ -61,7 +62,7 @@ var TestCtrl1=klass({
   {/if}
 </template>
 
-
+<script>
 describe("External component integration", function () {
     beforeEach(function() {
         msg='';
@@ -120,3 +121,4 @@ describe("External component integration", function () {
     });
 
 });
+</script>
diff --git a/test/rt/cptrefresh.spec.hsp b/test/rt/cptrefresh.spec.hsp
index 851f8fd..195059f 100644
--- a/test/rt/cptrefresh.spec.hsp
+++ b/test/rt/cptrefresh.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2013 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +22,7 @@ var Cpt1 = klass({
     this.closed = true;
   }
 });
+</script>
 
 <template cpt1 using c:Cpt1>
 {if !c.closed}
@@ -33,7 +35,7 @@ var Cpt1 = klass({
   <#d.cpt />
 </template>
 
-
+<script>
 describe("Component refresh", function () {
     it("validates refresh with root if statement", function() {
         var h=ht.newTestContext(), d={cpt:cpt1};
@@ -56,3 +58,4 @@ describe("Component refresh", function () {
         h.$dispose();
     });
 });
+</script>
diff --git a/test/rt/cptwrapper.spec.hsp b/test/rt/cptwrapper.spec.hsp
index f0fdc7b..180b547 100644
--- a/test/rt/cptwrapper.spec.hsp
+++ b/test/rt/cptwrapper.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2013 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -114,13 +114,16 @@ lib.NbrField = klass({
     this.onafterreset({oldValue:v1,newValue:v2});
   }
 })
+</script>
 
 <template nbrfield using c:lib.NbrField>
   <input type="text" model="{c.internalValue}" class="nbrfield {{'error': c.invalidValue, 'mandatory': c.mandatory}}"/>
   <input type="button" value="..." onclick="{c.resetField()}"/>
 </template>
 
+<script>
 lib.nbrfield=nbrfield;
+</script>
 
 <template test(d)>
   <input type="text" value="{d.value}"/>
@@ -133,6 +136,7 @@ lib.nbrfield=nbrfield;
   <#lib.nbrfield value="{d.value}" min="-10" max="10"/>
 </template>
 
+<script>
 var resetCount=0, lastResetArg=0, lastEvtType="";
 function notifyReset(arg,evt) {
   resetCount++;
@@ -160,11 +164,13 @@ var HelloCtrl = klass({
         "inputChecked" : { type : "boolean" /*, defaultValue: false*/}
     }
 });
+</script>
 
 <template test3 using ctrl:HelloCtrl>
    <input type="checkbox" model="{ctrl.inputChecked}">
 </template>
 
+<script>
 describe("Component Nodes", function () {
   var ELEMENT_NODE=1;
   var TEXT_NODE=3;
@@ -371,3 +377,4 @@ it("tests a component inside another template", function() {
   });
 
 });
+</script>
diff --git a/test/rt/customAttributes.spec.hsp b/test/rt/customAttributes.spec.hsp
index d6bc1cc..e178dd0 100644
--- a/test/rt/customAttributes.spec.hsp
+++ b/test/rt/customAttributes.spec.hsp
@@ -1,5 +1,7 @@
+<script>
 var hsp = require("hsp/rt");
 var klass = klass=require("hsp/klass");
+</script>
 
 <template test1()>
     <div style="height: 20px" verybigdiv>
@@ -50,6 +52,7 @@ var klass = klass=require("hsp/klass");
     </div>
 </template>
 
+<script>
 describe("Custom attributes", function () {
 
     var status = null;
@@ -204,4 +207,5 @@ describe("Custom attributes", function () {
         n.$dispose();
         expect(status).to.equal("Clean");
     });
-});
\ No newline at end of file
+});
+</script>
diff --git a/test/rt/dynexpressions.spec.hsp b/test/rt/dynexpressions.spec.hsp
index 36a178c..b7c67a4 100644
--- a/test/rt/dynexpressions.spec.hsp
+++ b/test/rt/dynexpressions.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +19,7 @@ var ht=require("hsp/utils/hashtester");
 function foo(arg1,arg2) {
     return arg1+arg2;
 }
+</script>
 
 <template test1(d)>
     <div class="content">Value: {d.person[d.pp]}</div>
@@ -49,6 +51,7 @@ function foo(arg1,arg2) {
     <input type="text" model="{d.person[d.pp]}">
 </template>
 
+<script>
 describe("Dynamic path expressions", function () {
     var C=".content";
 
@@ -221,3 +224,4 @@ describe("Dynamic path expressions", function () {
     });
 
 });
+</script>
diff --git a/test/rt/elt.spec.hsp b/test/rt/elt.spec.hsp
index 417c85a..a461be7 100644
--- a/test/rt/elt.spec.hsp
+++ b/test/rt/elt.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@ var hsp=require("hsp/rt"),
     json=require("hsp/json"),
     ht=require("hsp/utils/hashtester"),
     klass=require("hsp/klass");
-
+</script>
 
 <template test1(person)>
     <div title="test1">
@@ -40,8 +40,9 @@ var hsp=require("hsp/rt"),
     <input type="text" value="{person.name}"/>
 </template>
 
-
+<script>
 var globalObject={value:"foo"};
+</script>
 <template test4()>
     <input type="text" value="{globalObject.value}"/>
 </template>
@@ -52,6 +53,7 @@ var globalObject={value:"foo"};
     </div>
 </template>
 
+<script>
 var TestCtl6=klass({
     attributes: {
         "selected" : { type : "boolean", defaultValue: false}
@@ -65,6 +67,7 @@ var TestCtl6=klass({
         this.label = (this.selected ? "checked" : "unchecked") + "(" + this.counter +")";
     }
 });
+</script>
 
 <template test6 using c:TestCtl6>
     // test onchange cross browser consitency
@@ -72,6 +75,7 @@ var TestCtl6=klass({
     <span class="label">{c.label}</span>
 </template>
 
+<script>
 describe("Element Nodes", function () {
     var ELEMENT_NODE=1;
     var TEXT_NODE=3;
@@ -217,3 +221,4 @@ describe("Element Nodes", function () {
     });
 
 });
+</script>
diff --git a/test/rt/evthandler.spec.hsp b/test/rt/evthandler.spec.hsp
index 7461939..ef36f5a 100644
--- a/test/rt/evthandler.spec.hsp
+++ b/test/rt/evthandler.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 
 var ht=require("hsp/utils/hashtester"),
     fireEvent=require("hsp/utils/eventgenerator").fireEvent;
+</script>
 
 <template test1(person,ctl)>
     <div title="test1" onclick="{ctl.handleClick()}">
@@ -41,7 +42,7 @@ var ht=require("hsp/utils/hashtester"),
     <img onclick="this.cbatt=123;return false;"/>
 </template>
 
-
+<script>
 var doClickCount = 0, doClickEvtType = "", doClickStrArg = "";
 function doClick (str, evt) {
     doClickCount++;
@@ -49,7 +50,6 @@ function doClick (str, evt) {
     doClickStrArg = str;
 }
 
-
 describe("Event Handlers", function () {
     function test2SpanNode (n, idx) {
         return n.node.childNodes[1 + idx * 3 + 1];
@@ -155,3 +155,4 @@ describe("Event Handlers", function () {
     });
 
 });
+</script>
diff --git a/test/rt/exprbinding.spec.hsp b/test/rt/exprbinding.spec.hsp
index 49aa07f..91153ba 100644
--- a/test/rt/exprbinding.spec.hsp
+++ b/test/rt/exprbinding.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +24,7 @@ function changeValueAndObject (data,val) {
 function changeValue (data,val) {
     $set(data.object,"value",val);
 }
+</script>
 
 <template test1(data) >
     <input class="in1" type="text" value="{data.object.value}" />
@@ -58,6 +60,7 @@ function changeValue (data,val) {
   </div>
 </template>
 
+<script>
 describe("Expression Bindings", function () {
     var INPUT1=".in1", INPUT2=".in2";
 
@@ -149,3 +152,4 @@ describe("Expression Bindings", function () {
         h.$dispose();
     });
 });
+</script>
diff --git a/test/rt/filescope.spec.hsp b/test/rt/filescope.spec.hsp
index d0a937b..6f27847 100644
--- a/test/rt/filescope.spec.hsp
+++ b/test/rt/filescope.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@ var hsp=require("hsp/rt"),
 function globalHelper() {
     return true;
 }
+</script>
 
 <template test1>
     {if (globalHelper())}
@@ -33,6 +34,7 @@ function globalHelper() {
   <#test1 />
 </template>
 
+<script>
 describe("Templates using expressions with global references", function () {
 
     it("should actually access the reference", function () {
@@ -50,3 +52,4 @@ describe("Templates using expressions with global references", function () {
     });
 
 });
+</script>
diff --git a/test/rt/fnexpressions.spec.hsp b/test/rt/fnexpressions.spec.hsp
index 1677694..ff35d60 100644
--- a/test/rt/fnexpressions.spec.hsp
+++ b/test/rt/fnexpressions.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +23,7 @@ function concat(a,b) {
 function endText(a) {
     return "*"+a+"*";
 }
+</script>
 
 <template test1(d)>
     <div class="content" title="{d.fn(d.msg1,d.msg2)}">foo</div>
@@ -52,13 +54,16 @@ function endText(a) {
     <div class="content">{d.sub.fn(d.msg1,d.msg2)}</div>
 </template>
 
+<script>
 function InvalidModifier() {}
+</script>
 
 <template test7(d)>
     {let modifier=new InvalidModifier()}
     <div class="content">{d.msg|modifier}</div>
 </template>
 
+<script>
 describe("Function expressions", function () {
     var C=".content";
 
@@ -268,3 +273,4 @@ describe("Function expressions", function () {
     });
 
 });
+</script>
diff --git a/test/rt/foreach.spec.hsp b/test/rt/foreach.spec.hsp
index 883a695..85e1678 100644
--- a/test/rt/foreach.spec.hsp
+++ b/test/rt/foreach.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@ var hsp=require("hsp/rt"),
     doc=require("hsp/rt/document"),
     ht=require("hsp/utils/hashtester"),
     klass=require("hsp/klass");
+</script>
 
 <template test1(label,names)>
     {foreach (name in names)}
@@ -81,10 +82,13 @@ var hsp=require("hsp/rt"),
     {/foreach}
 </template>
 
+<script>
 var items=[
     {value:"Iteam A"},
     {value:"Item B"}
 ];
+</script>
+
 <template test7>
     {foreach item in items}
         <div class="itm">
@@ -93,6 +97,7 @@ var items=[
     {/foreach}
 </template>
 
+<script>
 var Sorter=klass({
     $constructor:function(property) {
         this.ascending=true;
@@ -123,6 +128,7 @@ var Sorter=klass({
         return this.sort(array);
     }
 });
+</script>
 
 <template test8(d)>
     <div class="section2">
@@ -172,6 +178,7 @@ var Sorter=klass({
     </div>
 </template>
 
+<script>
 describe("ForEach Node", function () {
     function test1Count (arrayLength) {
         // return number of items produced by test 1
@@ -825,3 +832,4 @@ describe("ForEach Node", function () {
     });
     
 });
+</script>
diff --git a/test/rt/foreach_globals.spec.hsp b/test/rt/foreach_globals.spec.hsp
index 708ed29..6e142b4 100644
--- a/test/rt/foreach_globals.spec.hsp
+++ b/test/rt/foreach_globals.spec.hsp
@@ -1,5 +1,7 @@
+<script>
 var hsp=require("hsp/rt"),
     ht=require("hsp/utils/hashtester");
+</script>
 
 <template test(d)>
 <div class="section2">
@@ -11,6 +13,7 @@ var hsp=require("hsp/rt"),
 </div>
 </template>
 
+<script>
 describe('repeater with global pipe functions', function() {
     it("validates collection sorting through pipe expression being global", function() {
         var h=ht.newTestContext();
@@ -25,3 +28,4 @@ describe('repeater with global pipe functions', function() {
         h.$dispose();
     });
 });
+</script>
diff --git a/test/rt/global.spec.hsp b/test/rt/global.spec.hsp
index 923cd1a..a101950 100644
--- a/test/rt/global.spec.hsp
+++ b/test/rt/global.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 
 var hsp=require("hsp/rt"),
     ht=require("hsp/utils/hashtester");
+</script>
 
 <template test1()>
     <div class="content">Hello {msg}</div>
@@ -54,7 +55,7 @@ var hsp=require("hsp/rt"),
     </div>
 </template>
 
-
+<script>
 describe("Hashspace global object", function () {
     var h;
 
@@ -127,3 +128,4 @@ describe("Hashspace global object", function () {
     });
 
 });
+</script>
diff --git a/test/rt/if.spec.hsp b/test/rt/if.spec.hsp
index 61e5a4b..bd78b4e 100644
--- a/test/rt/if.spec.hsp
+++ b/test/rt/if.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 
 var hsp=require("hsp/rt"),
     json=require("hsp/json");
+</script>
 
 <template test1(person)>
     {if (person.firstName)}
@@ -63,7 +64,7 @@ var hsp=require("hsp/rt"),
   {/if}
 </template>
 
-
+<script>
 describe("If Node", function () {
     var COMMENT_NODE = 8;
 
@@ -219,3 +220,4 @@ describe("If Node", function () {
     });
 
 });
+</script>
diff --git a/test/rt/let.spec.hsp b/test/rt/let.spec.hsp
index 4189917..efba1b7 100644
--- a/test/rt/let.spec.hsp
+++ b/test/rt/let.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@ var hsp=require("hsp/rt"),
     klass=require("hsp/klass"),
     log=require("hsp/rt/log"),
     ht=require("hsp/utils/hashtester");
+</script>
 
 <template test1(d)>
     {let x=d.value, y=x+3}
@@ -65,6 +66,7 @@ var hsp=require("hsp/rt"),
     <div class="bar">{nm}</div>
 </template>
 
+<script>
 describe("Let statement", function () {
   
     it("validates let in template scope", function() {
@@ -147,3 +149,4 @@ describe("Let statement", function () {
         expect(h.logs().length).to.equal(0);
     });
 });
+</script>
diff --git a/test/rt/log.spec.hsp b/test/rt/log.spec.hsp
index 132e07b..3b480c2 100644
--- a/test/rt/log.spec.hsp
+++ b/test/rt/log.spec.hsp
@@ -1,4 +1,4 @@
- 
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@ var hsp=require("hsp/rt"),
     klass=require("hsp/klass"),
     log=require("hsp/rt/log"),
     ht=require("hsp/utils/hashtester");
+</script>
 
 <template test1(d)>
     Some text
@@ -41,6 +42,7 @@ var hsp=require("hsp/rt"),
     {/foreach}
 </template>
 
+<script>
 describe("Log statement", function () {
   
     it("validates static log literal values", function() {
@@ -54,7 +56,7 @@ describe("Log statement", function () {
 
         var f=''+h.logs(0).file, fname="log.spec.hsp";
         expect(f.slice(-fname.length)).to.equal(fname);
-        expect(h.logs(0).line).to.equal(27);
+        expect(h.logs(0).line).to.equal(28);
         expect(h.logs(0).column).to.equal(9);
         
         h.logs.clear();
@@ -111,3 +113,4 @@ describe("Log statement", function () {
     });
 
 });
+</script>
diff --git a/test/rt/subtemplates1.spec.hsp b/test/rt/subtemplates1.spec.hsp
index f762b75..e4ad043 100644
--- a/test/rt/subtemplates1.spec.hsp
+++ b/test/rt/subtemplates1.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@
 var hsp=require("hsp/rt"),
     fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     json=require("hsp/json");
+</script>
 
 <template content(label, value)>
     {:label}: {value}
@@ -46,9 +47,11 @@ var hsp=require("hsp/rt"),
     <#content label="{person.firstName}" value="{:person.lastName}"/>
 </template>
 
+<script>
 function concat(a,b) {
     return a+": "+b;
 }
+</script>
 
 <template test4(person)>
     {concat(person.firstName, person.lastName)}
@@ -81,6 +84,7 @@ function concat(a,b) {
     <#field3 attributes="{{myvalue: d}}"/>
 </template>
 
+<script>
 describe("Sub-template insertion", function () {
     it("tests a simple insertion", function () {
         var dm = {
@@ -275,3 +279,4 @@ describe("Sub-template insertion", function () {
         n.$dispose();
     });
 });
+</script>
diff --git a/test/rt/subtemplates2.spec.hsp b/test/rt/subtemplates2.spec.hsp
index ddaf60c..15dd484 100644
--- a/test/rt/subtemplates2.spec.hsp
+++ b/test/rt/subtemplates2.spec.hsp
@@ -1,4 +1,4 @@
-
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 
 var ht=require("hsp/utils/hashtester"),
     klass=require("hsp/klass");
+</script>
 
 <template test1(c)>
     <div class="content">
@@ -61,21 +62,26 @@ var ht=require("hsp/utils/hashtester"),
     contentB2: {msg} 
 </template>
 
+<script>
 var C2Controller=klass({
     attributes:{
         "msg":{type:"string",defaultValue:"no msg",binding:"1-way"},
         "foo":{type:"string",defaultValue:"foo"}
     }
 });
+</script>
 
 <template contentC2 using c:C2Controller>
     contentC2: {c.msg} {c.foo} 
 </template>
 
+<script>
 var ctxt={
     tpl:contentA2,
     msg:"hello"
 }
+</script>
+
 <template test4(ctxt)>
     <div class="content">
         Before -
@@ -94,6 +100,7 @@ var ctxt={
     </div>
 </template>
 
+<script>
 describe("Dynamic template insertion", function () {
     it("validates dynamic insertion with no template argument", function() {
         var h=ht.newTestContext(), c={tpl:contentA};
@@ -266,3 +273,4 @@ describe("Dynamic template insertion", function () {
         h.$dispose();
     });
 });
+</script>
diff --git a/test/rt/subtemplates3.spec.hsp b/test/rt/subtemplates3.spec.hsp
index 30d1a23..12bd712 100644
--- a/test/rt/subtemplates3.spec.hsp
+++ b/test/rt/subtemplates3.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2014 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +25,7 @@ var addItem = function (items) {
 var removeItem = function (items, index) {
    items.splice(index, 1);
 };
+</script>
 
 <template displayItem(itms, idx)>
     <li onclick="{removeItem(itms, 0)}">Remove #{idx}</li>
@@ -65,7 +67,7 @@ var removeItem = function (items, index) {
   </div>
 </template>
 
-
+<script>
 describe("Sub- and parent- template scope interactions", function () {
     it("validates property bubbling from sub-template to parent", function() {
         var h=ht.newTestContext();
@@ -129,4 +131,4 @@ describe("Sub- and parent- template scope interactions", function () {
         h.$dispose();
     });
 });
-
+</script>
diff --git a/test/rt/svg.spec.hsp b/test/rt/svg.spec.hsp
index c483c93..89636a4 100644
--- a/test/rt/svg.spec.hsp
+++ b/test/rt/svg.spec.hsp
@@ -1,6 +1,8 @@
+<script>
 var hsp = require("hsp/rt");
 var browser = require("hsp/rt/browser");
 var ht = require("hsp/utils/hashtester");
+</script>
 
 <template svgTest()>
     <svg>
@@ -8,6 +10,7 @@ var ht = require("hsp/utils/hashtester");
     </svg>
 </template>
 
+<script>
 describe('svg support', function() {
 
     it('should not break and log error in browsers that dont support svg', function() {
@@ -26,4 +29,5 @@ describe('svg support', function() {
 
         h.$dispose();
     });
-})
\ No newline at end of file
+})
+</script>
diff --git a/test/rt/text.spec.hsp b/test/rt/text.spec.hsp
index 86ff80e..94fb5be 100644
--- a/test/rt/text.spec.hsp
+++ b/test/rt/text.spec.hsp
@@ -1,3 +1,4 @@
+<script>
 /*
  * Copyright 2012 Amadeus s.a.s.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +16,7 @@
 
 var hsp=require("hsp/rt"),
     json=require("hsp/json");
+</script>
 
 <template hello1()>
     Hello World!
@@ -28,17 +30,23 @@ var hsp=require("hsp/rt"),
     Hello {person.firstName} {person.lastName}!
 </template>
 
+<script>
 // same as hello3 but with unbound variable on the lastName
+</script>
 <template hello4(person)>
     Hello {person.firstName} {:person.lastName}!
 </template>
 
+<script>
 // same as hello3 but with a string parameter
+</script>
 <template hello5(name)>
     Hello {name}!
 </template>
 
+<script>
 var globalValue="foo";
+</script>
 <template hello6()>
     {globalValue}
 </template>
@@ -47,6 +55,7 @@ var globalValue="foo";
     {concat(d.firstName,d.lastName)}
 </template>
 
+<script>
 function concat(x,y) {
     return x+"-"+y;
 }
@@ -55,6 +64,7 @@ function compare(x,y) {
     var r=(x===y);
     return r;
 }
+</script>
 
 <template hello8(d)>
     {if compare(d.firstName,d.lastName)}
@@ -62,12 +72,14 @@ function compare(x,y) {
     {/if}
 </template>
 
+<script>
 var globalValueInt=0;
+</script>
 <template hello9()>
     {globalValueInt}
 </template>
 
-
+<script>
 describe("Text Nodes", function () {
     var TEXT_NODE = 3;
 
@@ -248,4 +260,5 @@ describe("Text Nodes", function () {
 
 });
 
-// TODO test root node with multiple chile nodes
\ No newline at end of file
+// TODO test root node with multiple chile nodes
+</script>
diff --git a/test/utils/eventgenerator.spec.hsp b/test/utils/eventgenerator.spec.hsp
index fdc8b3f..6f033b8 100644
--- a/test/utils/eventgenerator.spec.hsp
+++ b/test/utils/eventgenerator.spec.hsp
@@ -1,5 +1,7 @@
+<script>
 var fireEvent = require("hsp/utils/eventgenerator").fireEvent,
     fireKeydownEventAdaptedForKeyNav = require("hsp/utils/eventgenerator").fireKeydownEventAdaptedForKeyNav;
+</script>
 
 <template testEventGenerator(ctl)>
     <div onclick="{ctl.handleOtherClick()}"  onkeydown="{ctl.handleOtherKeyDown()}" style="display:none;">
@@ -9,6 +11,7 @@ var fireEvent = require("hsp/utils/eventgenerator").fireEvent,
     </div>
 </template>
 
+<script>
 describe("Event generator utils", function () {
     it("tests event generation", function () {
         var _fireEventState = "beforeClick";
@@ -57,4 +60,5 @@ describe("Event generator utils", function () {
         doc.body.removeChild(doc.body.lastChild);
         n.$dispose();
     });
-});
\ No newline at end of file
+});
+</script>
\ No newline at end of file
diff --git a/test/utils/hashtester.spec.hsp b/test/utils/hashtester.spec.hsp
index 32f654e..3dc9085 100644
--- a/test/utils/hashtester.spec.hsp
+++ b/test/utils/hashtester.spec.hsp
@@ -1,6 +1,8 @@
+<script>
 var ht=require("hsp/utils/hashtester"), 
     log=require("hsp/rt/log"),
     $set=require("hsp/$set");
+</script>
 
 <template testContent(data)>
     <div class="foo1 foo2">
@@ -14,6 +16,7 @@ var ht=require("hsp/utils/hashtester"),
     </ul>
 </template>
 
+<script>
 function increaseCount(d,incr) {
     $set(d,"count",d.count+incr);
 }
@@ -133,3 +136,4 @@ describe("HashTester", function () {
         expect(log.getNbrOfLoggers()).to.equal(initialNbr);
     });
 });
+</script>
\ No newline at end of file