Merge pull request #1 from patternfly/patternfly

V2 changes to bootstrap-treeview

Author: bleathem

.bowerrc

@@ -1,3 +1,3 @@
 node_modules/
-public/bower_components/
-.idea
+bower_components
+.idea

.gitignore

@@ -1,12 +1,15 @@
 language: node_js
 
 node_js:
-  - "0.11"
   - "0.10"
+  - "0.11"
+  - "0.12"
+  - "4"
+  - "5"
+  - "6"
 
 before_script:
   - npm install -g grunt-cli
   - npm install
-  - bower install
 
-script: grunt test --verbose --force
+script: grunt test --verbose --force

.travis.yml

@@ -1,11 +1,11 @@
 module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'), // the package file to use
- 
+
     uglify: {
       files: {
-        expand: true, 
-        flatten: true, 
+        expand: true,
+        flatten: true,
         src: 'src/js/*.js',
         dest: 'dist',
         ext: '.min.js'
@@ -32,18 +32,17 @@ module.exports = function(grunt) {
     },
 
     copy: {
-      main: { 
+      main: {
         files: [
-          // copy dist to tests
-          // { expand: true, cwd: 'dist', src: '*', dest: 'tests/lib/' },
+          // setup tests
           { expand: true, cwd: 'src/css', src: '*', dest: 'tests/lib/' },
           { expand: true, cwd: 'src/js', src: '*', dest: 'tests/lib/' },
-          // copy latest libs to tests
-          { expand: true, cwd: 'public/bower_components/jquery', src: 'jquery.js', dest: 'tests/lib/' },
-          { expand: true, cwd: 'public/bower_components/bootstrap-datepicker/js', src: 'bootstrap-datepicker.js', dest: 'tests/lib/' },
-          // copy src to example
+          { expand: true, cwd: 'node_modules/jquery/dist', src: 'jquery.js', dest: 'tests/lib/' },
+          // setup public
           { expand: true, cwd: 'src/css', src: '*', dest: 'public/css/' },
-          { expand: true, cwd: 'src/js', src: '*', dest: 'public/js/' }
+          { expand: true, cwd: 'src/js', src: '*', dest: 'public/js/' },
+          { expand: true, cwd: 'node_modules/bootstrap/dist/', src: '**/*', dest: 'public/libs/bootstrap/' },
+          { expand: true, cwd: 'node_modules/jquery/dist/', src: '*', dest: 'public/libs/jquery' }
         ]
       }
     }
@@ -57,6 +56,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
 
   // register one or more task lists (you should ALWAYS have a "default" task list)
-  grunt.registerTask('default', ['uglify','cssmin', 'copy', 'qunit', 'watch']);
+  grunt.registerTask('default', ['uglify', 'cssmin', 'copy', 'qunit', 'watch']);
   grunt.registerTask('test', 'qunit');
 };