Fix box widget icons and chart js version in bower issue

pull/1424/merge
Abdullah Almsaeed 2017-07-01 16:15:59 -04:00
parent 7cfbe94b7e
commit 76ce5a9c1f
8 changed files with 32 additions and 26 deletions

View File

@ -1,6 +1,5 @@
// AdminLTE Gruntfile // AdminLTE Gruntfile
module.exports = function (grunt) { // jshint ignore:line module.exports = function (grunt) { // jshint ignore:line
'use strict' 'use strict'
grunt.initConfig({ grunt.initConfig({
@ -9,27 +8,30 @@ module.exports = function (grunt) { // jshint ignore:line
less : { less : {
// Compiles less files upon saving // Compiles less files upon saving
files: ['build/less/*.less'], files: ['build/less/*.less'],
tasks: ['less:development', 'less:production'] tasks: ['less:development', 'less:production', 'notify:less']
}, },
js : { js : {
// Compile js files upon saving // Compile js files upon saving
files: ['build/js/*.js', 'dist/js/app.js'], files: ['build/js/*.js', 'dist/js/app.js'],
tasks: ['js'] tasks: ['js', 'notify:js']
}, },
skins: { skins: {
// Compile any skin less files upon saving // Compile any skin less files upon saving
files: ['build/less/skins/*.less'], files: ['build/less/skins/*.less'],
tasks: ['less:skins', 'less:minifiedSkins'] tasks: ['less:skins', 'less:minifiedSkins', 'notify:less']
} }
}, },
// Notify end of tasks
notify: { notify: {
less : { less: {
title : 'LESS Compiler',
message: 'LESS finished running'
},
uglify: {
options: { options: {
title : 'JS Compiler', title : 'AdminLTE',
message: 'LESS finished running'
}
},
js : {
options: {
title : 'AdminLTE',
message: 'JS bundler finished running' message: 'JS bundler finished running'
} }
} }

View File

@ -32,7 +32,7 @@
], ],
"dependencies": { "dependencies": {
"bootstrap-slider": "*", "bootstrap-slider": "*",
"chart.js": "^1.0.*", "chart.js": "1.0.*",
"ckeditor": "^4.7.0", "ckeditor": "^4.7.0",
"bootstrap-colorpicker": "^2.5.1", "bootstrap-colorpicker": "^2.5.1",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",

View File

@ -3,7 +3,7 @@
* Adds box widget functions to boxes. * Adds box widget functions to boxes.
* *
* @Usage: $('.my-box').boxWidget(options) * @Usage: $('.my-box').boxWidget(options)
* or add [data-widget="box-widget"] to the ul element * This plugin auto activates on any element using the `.box` class
* Pass any option as data-option="value" * Pass any option as data-option="value"
*/ */
+function ($) { +function ($) {
@ -64,7 +64,8 @@
$(this.element).removeClass(ClassName.collapsed) $(this.element).removeClass(ClassName.collapsed)
$(Selector.tools) $(this.element)
.find(Selector.tools)
.find('.' + expandIcon) .find('.' + expandIcon)
.removeClass(expandIcon) .removeClass(expandIcon)
.addClass(collapseIcon) .addClass(collapseIcon)
@ -80,7 +81,8 @@
var collapseIcon = this.options.collapseIcon var collapseIcon = this.options.collapseIcon
var expandIcon = this.options.expandIcon var expandIcon = this.options.expandIcon
$(Selector.tools) $(this.element)
.find(Selector.tools)
.find('.' + collapseIcon) .find('.' + collapseIcon)
.removeClass(collapseIcon) .removeClass(collapseIcon)
.addClass(expandIcon) .addClass(expandIcon)
@ -108,12 +110,12 @@
$(this.element).on('click', this.options.collapseTrigger, function (event) { $(this.element).on('click', this.options.collapseTrigger, function (event) {
if (event) event.preventDefault() if (event) event.preventDefault()
that.toggle($(this)) that.toggle()
}) })
$(this.element).on('click', this.options.removeTrigger, function (event) { $(this.element).on('click', this.options.removeTrigger, function (event) {
if (event) event.preventDefault() if (event) event.preventDefault()
that.remove($(this)) that.remove()
}) })
} }

View File

@ -3,7 +3,7 @@
* Adds the push menu functionality to the sidebar. * Adds the push menu functionality to the sidebar.
* *
* @usage: $('.btn').pushMenu(options) * @usage: $('.btn').pushMenu(options)
* or add [data-toggle="push-menu"] to any toggle button * or add [data-toggle="push-menu"] to any button
* Pass any option as data-option="value" * Pass any option as data-option="value"
*/ */
+function ($) { +function ($) {

14
dist/js/adminlte.js vendored
View File

@ -203,7 +203,7 @@ throw new Error('AdminLTE requires jQuery')
* Adds the push menu functionality to the sidebar. * Adds the push menu functionality to the sidebar.
* *
* @usage: $('.btn').pushMenu(options) * @usage: $('.btn').pushMenu(options)
* or add [data-toggle="push-menu"] to any toggle button * or add [data-toggle="push-menu"] to any button
* Pass any option as data-option="value" * Pass any option as data-option="value"
*/ */
+function ($) { +function ($) {
@ -668,7 +668,7 @@ throw new Error('AdminLTE requires jQuery')
* Adds box widget functions to boxes. * Adds box widget functions to boxes.
* *
* @Usage: $('.my-box').boxWidget(options) * @Usage: $('.my-box').boxWidget(options)
* or add [data-widget="box-widget"] to the ul element * This plugin auto activates on any element using the `.box` class
* Pass any option as data-option="value" * Pass any option as data-option="value"
*/ */
+function ($) { +function ($) {
@ -729,7 +729,8 @@ throw new Error('AdminLTE requires jQuery')
$(this.element).removeClass(ClassName.collapsed) $(this.element).removeClass(ClassName.collapsed)
$(Selector.tools) $(this.element)
.find(Selector.tools)
.find('.' + expandIcon) .find('.' + expandIcon)
.removeClass(expandIcon) .removeClass(expandIcon)
.addClass(collapseIcon) .addClass(collapseIcon)
@ -745,7 +746,8 @@ throw new Error('AdminLTE requires jQuery')
var collapseIcon = this.options.collapseIcon var collapseIcon = this.options.collapseIcon
var expandIcon = this.options.expandIcon var expandIcon = this.options.expandIcon
$(Selector.tools) $(this.element)
.find(Selector.tools)
.find('.' + collapseIcon) .find('.' + collapseIcon)
.removeClass(collapseIcon) .removeClass(collapseIcon)
.addClass(expandIcon) .addClass(expandIcon)
@ -773,12 +775,12 @@ throw new Error('AdminLTE requires jQuery')
$(this.element).on('click', this.options.collapseTrigger, function (event) { $(this.element).on('click', this.options.collapseTrigger, function (event) {
if (event) event.preventDefault() if (event) event.preventDefault()
that.toggle($(this)) that.toggle()
}) })
$(this.element).on('click', this.options.removeTrigger, function (event) { $(this.element).on('click', this.options.removeTrigger, function (event) {
if (event) event.preventDefault() if (event) event.preventDefault()
that.remove($(this)) that.remove()
}) })
} }

File diff suppressed because one or more lines are too long

2
dist/js/app.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1134,7 +1134,7 @@
<!-- Bootstrap 3.3.7 --> <!-- Bootstrap 3.3.7 -->
<script src="../../bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script src="../../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- Select2 --> <!-- Select2 -->
<script src="../../plugins/select2/select2.full.min.js"></script> <script src="../../bower_components/select2/dist/js/select2.full.min.js"></script>
<!-- InputMask --> <!-- InputMask -->
<script src="../../plugins/input-mask/jquery.inputmask.js"></script> <script src="../../plugins/input-mask/jquery.inputmask.js"></script>
<script src="../../plugins/input-mask/jquery.inputmask.date.extensions.js"></script> <script src="../../plugins/input-mask/jquery.inputmask.date.extensions.js"></script>