refactor for latest component(1)

component · Aug 12, 2012 · ebca955 · ebca955
1 parent 4880b72
commit ebca955
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 test/*.js
 test/*.css
+components
+build
diff --git a/Makefile b/Makefile
@@ -1,8 +1,14 @@
 
-test/out.js: index.js popover.css
-	component build package.json test/out
+build: popover.css index.js template.js components
+	@component build
+
+template.js: template.html
+	@component convert $<
+
+components:
+	@component install
 
 clean:
-	rm -f test/out.{js,css}
+	rm -fr build components
 
-.PHONY: clean
+.PHONY: clean
diff --git a/component.json b/component.json
@@ -7,7 +7,6 @@
     "component/tip": "*",
     "component/jquery": "*"
   },
-  "scripts": ["index.js"],
-  "styles": ["popover.css"],
-  "templates": ["popover.html"]
+  "scripts": ["index.js", "template.js"],
+  "styles": ["popover.css"]
 }
diff --git a/index.js b/index.js
@@ -22,7 +22,7 @@ module.exports = Popover;
  */
 
 function Popover(content, title) {
-  this.popover = o(render('popover'));
+  this.popover = o(require('./template'));
   Tip.call(this, this.popover);
   this.classname = 'popover';
   this.el.addClass('popover');

diff --git a/package.json b/package.json
diff --git a/popover.html → template.html b/popover.html → template.html
diff --git a/template.js b/template.js
diff --git a/test/index.html b/test/index.html
@@ -3,7 +3,7 @@
   <head>
     <title>Popover</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" href="out.css" />
+    <link rel="stylesheet" href="../build/build.css" />
     <style>
       body {
         padding: 60px;
@@ -25,7 +25,7 @@
   </head>
   <body>
     <title>Popover</title>
-    <script src="out.js"></script>
+    <script src="../build/build.js"></script>
     <a href="#" id="north">North</a>
     <a href="#" id="east">East</a>
     <a href="#" id="west">West</a>