Merge pull request #21 from wesleycho/master

aloise · aloise · commit 3e7dffcc3874 · 2013-07-10T13:49:26.000-07:00
Updated files related to Bower
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+	"directory": "bower_components"
+}
diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
   "ignore": [
     "**/.*",
     "node_modules",
-    "components",
+    "bower_components",
     "test*",
     "demo*",
     "gruntFile.js",
diff --git a/demo/demo.html b/demo/demo.html
@@ -9,9 +9,9 @@
   <title>AngularUI - Date Picker Demo</title>
   <base href=".."></base>
   <link rel="stylesheet" href="components/jquery-ui/themes/smoothness/jquery-ui.css">
-  <script type="text/javascript" src="components/jquery/jquery.js"></script>
-  <script type="text/javascript" src="components/jquery-ui/ui/jquery-ui.custom.js"></script>
-  <script type="text/javascript" src="components/angular/angular.js"></script>
+  <script type="text/javascript" src="bower_components/jquery/jquery.js"></script>
+  <script type="text/javascript" src="bower_components/jquery-ui/ui/jquery-ui.custom.js"></script>
+  <script type="text/javascript" src="bower_components/angular/angular.js"></script>
   <script type="text/javascript" src="src/date.js"></script>
 </head>
 <body ng-app="ui.date">
diff --git a/test/test.conf.js b/test/test.conf.js
@@ -2,10 +2,10 @@ basePath = '..';
 files = [
   JASMINE,
   JASMINE_ADAPTER,
-  'components/jquery/jquery.js',
-  'components/jquery-ui/ui/jquery-ui.custom.js',
-  'components/angular/angular.js',
-  'components/angular-mocks/angular-mocks.js',
+  'bower_components/jquery/jquery.js',
+  'bower_components/jquery-ui/ui/jquery-ui.custom.js',
+  'bower_components/angular/angular.js',
+  'bower_components/angular-mocks/angular-mocks.js',
   'src/sortable.js',
   'test/*.spec.js'
 ];

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "directory": "bower_components"`
	`3`	`+}`