Merged and grunted angular-ui#1915

tedeh · May 4, 2015 · 9ccc738 · 9ccc738
1 parent 1b6a1dc
commit 9ccc738
Show file tree

Hide file tree

Showing 9 changed files with 8,325 additions and 160 deletions.
diff --git a/.bower.json b/.bower.json
@@ -0,0 +1,31 @@
+{
+  "author": {
+    "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+  },
+  "name": "angular-bootstrap",
+  "keywords": [
+    "angular",
+    "angular-ui",
+    "bootstrap"
+  ],
+  "license": "MIT",
+  "ignore": [],
+  "description": "Native AngularJS (Angular) directives for Bootstrap.",
+  "version": "0.12.1",
+  "main": [
+    "./ui-bootstrap-tpls.js"
+  ],
+  "dependencies": {
+    "angular": ">=1 <1.3.0"
+  },
+  "homepage": "https://github.com/angular-ui/bootstrap-bower",
+  "_release": "0.12.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.12.1",
+    "commit": "ab14fbaaf3d592f8e76018f0666c5af6f68ebaa3"
+  },
+  "_source": "git://github.com/angular-ui/bootstrap-bower.git",
+  "_target": "0.12.1",
+  "_originalSource": "angular-bootstrap"
+}
diff --git a/bower.json b/bower.json
@@ -0,0 +1,19 @@
+{
+    "author": {
+        "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+    },
+    "name": "angular-bootstrap",
+    "keywords": [
+        "angular",
+        "angular-ui",
+        "bootstrap"
+    ],
+    "license": "MIT",
+    "ignore": [],
+    "description": "Native AngularJS (Angular) directives for Bootstrap.",
+    "version": "0.12.1",
+    "main": ["./ui-bootstrap-tpls.js"],
+    "dependencies": {
+        "angular": ">=1 <1.3.0"
+    }    
+}
diff --git a/dist/assets/app.js b/dist/assets/app.js
@@ -1,4 +1,4 @@
-angular.module('bootstrapDemoApp', ['ui.bootstrap', 'plunker', 'ngTouch'], function($httpProvider){
+angular.module('ui.bootstrap.demo', ['ui.bootstrap', 'plunker', 'ngTouch'], function($httpProvider){
   FastClick.attach(document.body);
   delete $httpProvider.defaults.headers.common['X-Requested-With'];
 }).run(['$location', function($location){
@@ -89,4 +89,4 @@ var DownloadCtrl = function($scope, $modalInstance) {
   $scope.cancel = function () {
     $modalInstance.dismiss();
   };
-}
+};
diff --git a/dist/assets/plunker.js b/dist/assets/plunker.js
@@ -13,10 +13,10 @@ angular.module('plunker', [])
 
       var indexContent = function (content, version) {
         return '<!doctype html>\n' +
-          '<html ng-app="plunker">\n' +
+          '<html ng-app="ui.bootstrap.demo">\n' +
           '  <head>\n' +
-          '    <script src="http://ajax.googleapis.com/ajax/libs/angularjs/'+ngVersion+'/angular.js"></script>\n' +
-          '    <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-'+version+'.js"></script>\n' +
+          '    <script src="//ajax.googleapis.com/ajax/libs/angularjs/'+ngVersion+'/angular.js"></script>\n' +
+          '    <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-'+version+'.js"></script>\n' +
           '    <script src="example.js"></script>\n' +
           '    <link href="//netdna.bootstrapcdn.com/bootstrap/'+bsVersion+'/css/bootstrap.min.css" rel="stylesheet">\n' +
           '  </head>\n' +
@@ -27,7 +27,7 @@ angular.module('plunker', [])
       };
 
       var scriptContent = function(content) {
-        return "angular.module('plunker', ['ui.bootstrap']);" + "\n" + content;
+        return "angular.module('ui.bootstrap.demo', ['ui.bootstrap']);" + "\n" + content;
       };
 
       addField('description', 'http://angular-ui.github.io/bootstrap/');

diff --git a/dist/index.html b/dist/index.html