From 8781ae4854ce40b92fe8ddbc437a8d19cca6366f Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Wed, 26 Oct 2016 09:30:06 -0400 Subject: [PATCH] Add Search plugin to babel compiler and reformat code style --- build/grunt/babel.js | 15 ++++++++------- build/grunt/bootlint.js | 4 ++-- build/grunt/concat.js | 9 +++++---- build/grunt/csslint.js | 6 +++--- build/grunt/eslint.js | 4 ++-- build/grunt/image.js | 8 ++++---- build/grunt/includes.js | 8 ++++---- build/grunt/jscs.js | 6 +++--- build/grunt/jshint.js | 8 ++++---- build/grunt/notify.js | 2 +- build/grunt/sass.js | 40 ++++++++++++++++++++-------------------- build/grunt/uglify.js | 6 +++--- build/grunt/watch.js | 4 ++-- 13 files changed, 61 insertions(+), 59 deletions(-) diff --git a/build/grunt/babel.js b/build/grunt/babel.js index e8aa9dc7d..f8f39867f 100644 --- a/build/grunt/babel.js +++ b/build/grunt/babel.js @@ -5,16 +5,17 @@ module.exports = function (grunt) { return { options: { sourceMap: true, - presets: ['es2015'] + presets : ['es2015'] }, - dist: { + dist : { files: { - 'build/js/dist/Layout.js': 'build/js/src/Layout.js', - 'build/js/dist/Treeview.js': 'build/js/src/Treeview.js', - 'build/js/dist/PushMenu.js': 'build/js/src/PushMenu.js', - 'build/js/dist/Widget.js': 'build/js/src/Widget.js', + 'build/js/dist/Layout.js' : 'build/js/src/Layout.js', + 'build/js/dist/Treeview.js' : 'build/js/src/Treeview.js', + 'build/js/dist/PushMenu.js' : 'build/js/src/PushMenu.js', + 'build/js/dist/Widget.js' : 'build/js/src/Widget.js', 'build/js/dist/ControlSidebar.js': 'build/js/src/ControlSidebar.js', - 'dist/js/adminlte.js': 'build/js/src/AdminLTE.js' + 'build/js/dist/Search.js' : 'build/js/src/Search.js', + 'dist/js/adminlte.js' : 'build/js/src/AdminLTE.js' } } }; diff --git a/build/grunt/bootlint.js b/build/grunt/bootlint.js index 20923ce98..5375768cf 100644 --- a/build/grunt/bootlint.js +++ b/build/grunt/bootlint.js @@ -2,11 +2,11 @@ 'use strict'; module.exports = function (grunt) { - return { + return { options: { relaxerror: ['W005'] }, // files: ['pages/**/*.html', '*.html'] - files: ['starter.html'] + files : ['starter.html'] }; }; diff --git a/build/grunt/concat.js b/build/grunt/concat.js index 6b40b7465..8f07d4577 100644 --- a/build/grunt/concat.js +++ b/build/grunt/concat.js @@ -3,17 +3,18 @@ module.exports = function (grunt) { return { - options: { + options : { stripBanners: true, - banner: '<%= banner %>' + banner : '<%= banner %>' }, adminlte: { - src: [ + src : [ 'build/js/src/Layout.js', 'build/js/src/Treeview.js', 'build/js/src/PushMenu.js', 'build/js/src/Widget.js', - 'build/js/src/ControlSidebar.js' + 'build/js/src/ControlSidebar.js', + 'build/js/src/Search.js' ], dest: 'build/js/src/AdminLTE.js' } diff --git a/build/grunt/csslint.js b/build/grunt/csslint.js index 13352d1f8..6e67e4ba9 100644 --- a/build/grunt/csslint.js +++ b/build/grunt/csslint.js @@ -2,11 +2,11 @@ 'use strict'; module.exports = function (grunt) { - return { - options: { + return { + options: { csslintrc: 'build/less/.csslintrc' }, - dist: [ + dist : [ 'dist/css/AdminLTE.css', ] } diff --git a/build/grunt/eslint.js b/build/grunt/eslint.js index 52ca858eb..3e58ec0ea 100644 --- a/build/grunt/eslint.js +++ b/build/grunt/eslint.js @@ -2,10 +2,10 @@ 'use strict'; module.exports = function (grunt) { - return { + return { options: { configFile: 'build/js/.eslintrc' }, - target: 'build/js/src/*.js' + target : 'build/js/src/*.js' }; }; diff --git a/build/grunt/image.js b/build/grunt/image.js index 599251364..5cb5cb042 100644 --- a/build/grunt/image.js +++ b/build/grunt/image.js @@ -2,13 +2,13 @@ 'use strict'; module.exports = function (grunt) { - return { + return { dynamic: { files: [{ expand: true, - cwd: 'build/img/', - src: ['**/*.{png,jpg,gif,svg,jpeg}'], - dest: 'dist/img/' + cwd : 'build/img/', + src : ['**/*.{png,jpg,gif,svg,jpeg}'], + dest : 'dist/img/' }] } }; diff --git a/build/grunt/includes.js b/build/grunt/includes.js index 630028931..6e497991e 100644 --- a/build/grunt/includes.js +++ b/build/grunt/includes.js @@ -4,12 +4,12 @@ module.exports = function (grunt) { return { build: { - src: ['*.html'], // Source files - dest: 'documentation/', // Destination directory + src : ['*.html'], // Source files + dest : 'documentation/', // Destination directory flatten: true, - cwd: 'documentation/build', + cwd : 'documentation/build', options: { - silent: true, + silent : true, includePath: 'documentation/build/include' } } diff --git a/build/grunt/jscs.js b/build/grunt/jscs.js index 373d0c923..edabebda6 100644 --- a/build/grunt/jscs.js +++ b/build/grunt/jscs.js @@ -2,14 +2,14 @@ 'use strict'; module.exports = function (grunt) { - return { + return { options: { config: 'build/js/.jscsrc' }, - grunt: { + grunt : { src: ['Gruntfile.js'] }, - core: { + core : { src: 'js/src/*.js' } /*app: { diff --git a/build/grunt/jshint.js b/build/grunt/jshint.js index 4afaacc7a..03a5b6dd3 100644 --- a/build/grunt/jshint.js +++ b/build/grunt/jshint.js @@ -2,17 +2,17 @@ 'use strict'; module.exports = function (grunt) { - return { + return { options: { jshintrc: '.jshintrc' }, - core: { + core : { src: 'dist/js/app.js' }, - demo: { + demo : { src: 'dist/js/demo.js' }, - pages: { + pages : { src: 'dist/js/pages/*.js' } }; diff --git a/build/grunt/notify.js b/build/grunt/notify.js index e5dd94693..3d7065d36 100644 --- a/build/grunt/notify.js +++ b/build/grunt/notify.js @@ -5,7 +5,7 @@ module.exports = function (grunt) { return { watch: { options: { - title: 'Task Complete', // optional + title : 'Task Complete', // optional message: 'SASS and Uglify finished running', //required } } diff --git a/build/grunt/sass.js b/build/grunt/sass.js index ac83aa797..11eda7b48 100644 --- a/build/grunt/sass.js +++ b/build/grunt/sass.js @@ -4,26 +4,26 @@ module.exports = function (grunt) { return { - development: { - options: { - precision: 6, - sourceComments: false, - sourceMap: true, - outputStyle: 'expanded' - }, - files: { - 'dist/css/adminlte.css': 'build/scss/AdminLTE.scss' - } + development: { + options: { + precision : 6, + sourceComments: false, + sourceMap : true, + outputStyle : 'expanded' }, - production: { - options: { - sourceComments: false, - sourceMap: true, - outputStyle: 'compressed' - }, - files: { - 'dist/css/adminlte.min.css': 'build/scss/AdminLTE.scss' - } + files : { + 'dist/css/adminlte.css': 'build/scss/AdminLTE.scss' } - }; + }, + production : { + options: { + sourceComments: false, + sourceMap : true, + outputStyle : 'compressed' + }, + files : { + 'dist/css/adminlte.min.css': 'build/scss/AdminLTE.scss' + } + } + }; }; diff --git a/build/grunt/uglify.js b/build/grunt/uglify.js index 3608df687..87ee8a339 100644 --- a/build/grunt/uglify.js +++ b/build/grunt/uglify.js @@ -4,13 +4,13 @@ module.exports = function (grunt) { return { options: { - mangle: true, + mangle : true, preserveComments: 'some' }, - target: { + target : { files: { 'dist/js/adminlte.min.js': ['dist/js/adminlte.js'], - 'dist/js/app.min.js': ['dist/js/app.js'] + 'dist/js/app.min.js' : ['dist/js/app.js'] } } }; diff --git a/build/grunt/watch.js b/build/grunt/watch.js index 93b2b490f..471404814 100644 --- a/build/grunt/watch.js +++ b/build/grunt/watch.js @@ -7,11 +7,11 @@ module.exports = function (grunt) { files: ['build/scss/*.scss', 'build/scss/skins/*.scss'], tasks: ['sass', 'notify:watch'] }, - es6: { + es6 : { files: ['build/js/src/*.js'], tasks: ['concat', 'babel', 'uglify', 'notify:watch'] }, - js: { + js : { files: ['dist/js/adminlte.js', 'dist/js/app.js'], tasks: ['uglify', 'notify:watch'] }