feat: <enhancement of script in component>

momoko8443 · Sep 4, 2018 · e32a0e0 · e32a0e0
1 parent e387faf
commit e32a0e0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/demo/components/comp5.html b/demo/components/comp5.html
@@ -19,6 +19,7 @@
                         if(value !== undefined){
                             this.myItemValue2 = value;
                             console.log(this.myItemValue2);
+                            console.log(uku);
                         }
                     }
                 })

diff --git a/demo/components/comp6.html b/demo/components/comp6.html
@@ -0,0 +1,16 @@
+<uku-component>
+    <template>
+        <div>{{cc.a}}</div>
+        <div>{{cc.b}}</div>
+        <button uku-onclick="cc.sayHello()">click</button>
+    </template>
+    <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
+    <script>
+        this.a = 'a';
+        this.b = 'b';
+        this.sayHello = function(){
+            alert(uku);
+            alert($);
+        };
+    </script>
+</uku-component>
diff --git a/demo/native.html b/demo/native.html
@@ -8,15 +8,12 @@
                 color:green;
             }
         </style>
-        <!-- <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script> -->
         <script src="../dist/uku.js"></script>
     </head>
 
 <body uku-application>
     <my-comp5 uku-item-value="99 + myCtrl.number" uku-item-value2="myCtrl.show"></my-comp5>
-    <div>
-        {{999}}
-    </div>
+    <my-comp6></my-comp6>
 </body>
 <script>
     var uku = new Ukulele();
@@ -27,7 +24,7 @@
     //uku.registerComponent('my-comp3','components/comp3.html');
     //uku.registerComponent('my-comp4','components/comp4.html');
     uku.registerComponent('my-comp5','components/comp5.html');
-
+    uku.registerComponent('my-comp6','components/comp6.html');
     uku.init();
 
     function MyCtrl(uku){

diff --git a/dist/uku.js b/dist/uku.js
diff --git a/dist/uku.js.map b/dist/uku.js.map
diff --git a/src/core/DefinitionManager.ts b/src/core/DefinitionManager.ts
@@ -223,6 +223,7 @@ export class DefinitionManager {
 		try {
 			let controllerClazz
 			if (script) {
+				script = UkuleleUtil.wrapScriptInComponent(script);
 				script += debugComment;
 				controllerClazz = eval(script);
 			}

diff --git a/src/util/UkuleleUtil.ts b/src/util/UkuleleUtil.ts
@@ -178,4 +178,24 @@ export class UkuleleUtil {
             eval(evalString);
         })();
     }
+
+    static wrapScriptInComponent(originalScript):string{
+        if(originalScript){
+            let trimScript = originalScript.replace(new RegExp('\\s', 'gm'),'');
+            if(trimScript.search(new RegExp('\\(function\\(')) === 0){
+                return originalScript;
+            }else{
+                let selfExcutingFrame = 
+                `	(function(){
+                        return function(uku){
+                            ${originalScript}
+                        };
+                    })();
+                `;
+                return selfExcutingFrame;
+            }
+        }else{
+            return "";
+        }
+    }
 }