Merge fcab2c5 into 711d77d

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;

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}}"

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>

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>

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>

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>

docs/samples/component2/nbrfield.hsp

@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // Component controller
@@ -68,8 +69,9 @@ function getNumber(s) {
     if (!NBR_DIGITS.test(s)) return null;
     return Number(s);
 }
+</script>
 
-// component template associated with the NbrField controller
+<!-- component template associated with the NbrField controller -->
 <export template nbrfield using c:NbrField>
   <span class="nbrfield">
     <input type="text" model="{c.internalValue}"
@@ -78,7 +80,7 @@ function getNumber(s) {
   </span>
 </template>
 
-// component usage
+<!-- component usage -->
 <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 +90,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>

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>

docs/samples/conditions/conditions.hsp

@@ -1,6 +1,8 @@
+<script>
 var klass=require("hsp/klass");
+</script>
 
-// nt is an instance of NumberTester
+<!-- nt is an instance of NumberTester -->
 <template test(nt)>
     <div>
         Number: <span class="textvalue">{nt.number}</span>
@@ -23,6 +25,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 +47,4 @@ module.exports = {
         return [new NumberTester()];
     }
 };
+</script>

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>

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>

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>

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>

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>

docs/samples/helloworld/hello.hsp

@@ -1,13 +1,18 @@
-// edit me!
+<!--
+edit me!
+-->
+
 <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>

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>

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>

docs/samples/list1/list.hsp

@@ -1,3 +1,4 @@
+<script>
 var klass=require("hsp/klass");
 
 // simple list controller
@@ -12,8 +13,9 @@ var ListController = klass({
     "separator": {type:"template"}
   }
 });
+</script>
 
-// simple list template
+<!-- simple list template -->
 <template list using lc:ListController>
   // content is the list of attribute sub-elements
   <div class="list {lc.class}">
@@ -36,7 +38,7 @@ var ListController = klass({
   </div>
 </template>
 
-// test template
+<!-- test template -->
 <template test(d)>
   <#list head="Static list" class="listcpt">
     <@option>First {d.itemName}</@option>
@@ -60,6 +62,7 @@ var ListController = klass({
   </#list>
 </template>
 
+<script>
 var count=0, model={
   itemName: "item",
   preferredOption:"My favourite things",
@@ -87,3 +90,4 @@ module.exports = {
     template: test,
     data: [model]
 };
+</script>