Merge 280ca1d into 224efcf

ariatemplates · Jun 16, 2014 · 907c3fe · 907c3fe
2 parents 224efcf + 280ca1d
commit 907c3fe
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 22 deletions.
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -6,8 +6,8 @@
     <link href="/images/favicon.ico" type="image/ico" rel="shortcut icon"/>
     <link rel="stylesheet" href="/css/all.css" type="text/css"/>
     <link rel="stylesheet" href="/css/site.css" type="text/css"/>
-    <link rel="stylesheet" href="/css/highlightjs/default-8.0.min.css" type="text/css"/>
-    <script src="/libs/highlightjs/highlight-8.0.min.js"></script>
+    <link rel="stylesheet" href="/css/highlightjs/default-7.2.min.css" type="text/css"/>
+    <script src="/libs/highlightjs/highlight-7.2.min.js"></script>
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript" charset="utf-8"></script>
     <![endif]-->

diff --git a/docs/css/highlightjs/default-7.2.min.css b/docs/css/highlightjs/default-7.2.min.css
diff --git a/docs/css/highlightjs/default-8.0.min.css b/docs/css/highlightjs/default-8.0.min.css
diff --git a/docs/libs/highlightjs/highlight-7.2.min.js b/docs/libs/highlightjs/highlight-7.2.min.js
diff --git a/docs/libs/highlightjs/highlight-8.0.min.js b/docs/libs/highlightjs/highlight-8.0.min.js
diff --git a/hsp/compiler/jsgenerator/processors.js b/hsp/compiler/jsgenerator/processors.js
@@ -62,7 +62,7 @@ exports["template"] = function (node, walker) {
     walker.templates[templateName] = templateCode;
 
     var exportString = '';
-    if (node.export === true) {
+    if (node.isExport === true) {
         exportString = ' =exports.' + templateName;
     }
 

diff --git a/hsp/compiler/treebuilder/syntaxTree.js b/hsp/compiler/treebuilder/syntaxTree.js
@@ -200,7 +200,7 @@ var SyntaxTree = klass({
                 }
             }
         }
-        node.export = block.mod === "export";
+        node.isExport = block.mod === "export";
         node.startLine = block.line;
         node.endLine = block.endLine;
         node.content = [];

diff --git a/test/compiler/samples/class1.txt b/test/compiler/samples/class1.txt
@@ -55,7 +55,7 @@
 ##### Syntax Tree
 [
   {
-    "type": "template","name": "test","args": ["msg"],"export": false, "content": [
+    "type": "template","name": "test","args": ["msg"],"isExport": false, "content": [
       {
         "type": "element","name": "div","closed": false,"attributes": [
           {

diff --git a/test/compiler/samples/component1.txt b/test/compiler/samples/component1.txt
@@ -50,7 +50,7 @@
     "type": "template",
     "name": "foo",
     "args": [],
-    "export": false,
+    "isExport": false,
     "content": [
       { "type": "text","value": "foo " },
       {

diff --git a/test/compiler/samples/component2.txt b/test/compiler/samples/component2.txt
@@ -35,7 +35,7 @@
       "path": ["foo","ComponentController"],
       "code": "foo.ComponentController"
     },
-    "export": false,
+    "isExport": false,
     "startLine": 2,
     "endLine": 4,
     "content": [

diff --git a/test/compiler/samples/component5.txt b/test/compiler/samples/component5.txt
@@ -47,7 +47,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": [],"export": false,"startLine": 1,"endLine": 7,
+    "type": "template","name": "test","args": [],"isExport": false,"startLine": 1,"endLine": 7,
     "content": [
       {
         "type": "component","closed": false,"ref": {"category": "objectref","path": ["panel"],"code": "panel"},

diff --git a/test/compiler/samples/component6.txt b/test/compiler/samples/component6.txt
@@ -47,7 +47,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": [],"export": false,"startLine": 1,"endLine": 7,
+    "type": "template","name": "test","args": [],"isExport": false,"startLine": 1,"endLine": 7,
     "content": [
       {
         "type": "component","closed": false,"ref": {"category": "objectref","path": ["panel"],"code": "panel"},

diff --git a/test/compiler/samples/if4.txt b/test/compiler/samples/if4.txt
@@ -60,7 +60,7 @@
     "type": "template",
     "name": "test",
     "args": ["x"],
-    "export": false,
+    "isExport": false,
     "startLine": 1,
     "endLine": 9,
     "content": [

diff --git a/test/compiler/samples/jsexpression1.txt b/test/compiler/samples/jsexpression1.txt
@@ -72,7 +72,7 @@
     "type": "template",
     "name": "test",
     "args": ["value"],
-    "export": false,
+    "isExport": false,
     "content": [
       { "type": "if",
         "condition": {

diff --git a/test/compiler/samples/jsexpression10.txt b/test/compiler/samples/jsexpression10.txt
@@ -12,7 +12,7 @@
     "type": "template",
     "name": "hello",
     "args": [ "person", "foo", "bar" ],
-    "export": false,
+    "isExport": false,
     "startLine": 1,
     "endLine": 3,
     "content": [

diff --git a/test/compiler/samples/jsexpression13.txt b/test/compiler/samples/jsexpression13.txt
@@ -49,7 +49,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": ["person"],"export": false,"startLine": 1,"endLine": 3,
+    "type": "template","name": "test","args": ["person"],"isExport": false,"startLine": 1,"endLine": 3,
     "content": [
       {
         "type": "textblock",

diff --git a/test/compiler/samples/jsexpression14.txt b/test/compiler/samples/jsexpression14.txt
@@ -45,7 +45,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": ["person"],"export": false,"startLine": 1,"endLine": 3,
+    "type": "template","name": "test","args": ["person"],"isExport": false,"startLine": 1,"endLine": 3,
     "content": [
       {
         "type": "textblock",

diff --git a/test/compiler/samples/jsexpression15.txt b/test/compiler/samples/jsexpression15.txt
@@ -91,7 +91,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": ["person"],"export": false,"startLine": 1,"endLine": 5,
+    "type": "template","name": "test","args": ["person"],"isExport": false,"startLine": 1,"endLine": 5,
     "content": [
       {
         "type": "element",

diff --git a/test/compiler/samples/jsexpression16.txt b/test/compiler/samples/jsexpression16.txt
@@ -91,7 +91,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "test","args": ["person"],"export": false,"startLine": 1,"endLine": 5,
+    "type": "template","name": "test","args": ["person"],"isExport": false,"startLine": 1,"endLine": 5,
     "content": [
       {
         "type": "element",

diff --git a/test/compiler/samples/jsexpression8.txt b/test/compiler/samples/jsexpression8.txt
@@ -30,7 +30,7 @@
 ##### Syntax Tree:
 [
   {
-    "type": "template","name": "hello","args": ["person","property"],"export": false,"startLine": 1,"endLine": 3,
+    "type": "template","name": "hello","args": ["person","property"],"isExport": false,"startLine": 1,"endLine": 3,
     "content": [
       {
         "type": "textblock",

diff --git a/test/compiler/samples/template2.txt b/test/compiler/samples/template2.txt
@@ -17,7 +17,7 @@
 
 [ 
   { type: 'plaintext', value: '\n'},
-  { type: 'template', name: 'hello4', export:true, args: [], content: [
+  { type: 'template', name: 'hello4', isExport:true, args: [], content: [
     { type: 'text', value: 'Hello World!' } 
   ]}
 ]

diff --git a/test/compiler/samples/text4.txt b/test/compiler/samples/text4.txt
@@ -47,7 +47,7 @@
     "args": [
       "name"
     ],
-    "export": false,
+    "isExport": false,
     "content": [
       {
         "type": "textblock",

diff --git a/test/compiler/samples/voidelement.txt b/test/compiler/samples/voidelement.txt
@@ -49,7 +49,7 @@
     "type": "template",
     "name": "test",
     "args": [],
-    "export": false,
+    "isExport": false,
     "content": [
       {"type": "text", "value": "Hello"},
       {"type": "element", "name": "br", "closed": true},