From b98b5914e7b32389da03eaee639af6f8088ed411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Gaujard?= Date: Thu, 26 Oct 2017 22:27:57 +0200 Subject: [PATCH 1/5] Change JS comment for better parsing (#1693) --- pages/examples/login.html | 2 +- pages/examples/register.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/examples/login.html b/pages/examples/login.html index c304e0e4d..1e47e84aa 100644 --- a/pages/examples/login.html +++ b/pages/examples/login.html @@ -89,7 +89,7 @@ $('input').iCheck({ checkboxClass: 'icheckbox_square-blue', radioClass: 'iradio_square-blue', - increaseArea: '20%' // optional + increaseArea: '20%' /* optional */ }); }); diff --git a/pages/examples/register.html b/pages/examples/register.html index a314757ae..29d8ccf35 100644 --- a/pages/examples/register.html +++ b/pages/examples/register.html @@ -94,7 +94,7 @@ $('input').iCheck({ checkboxClass: 'icheckbox_square-blue', radioClass: 'iradio_square-blue', - increaseArea: '20%' // optional + increaseArea: '20%' /* optional */ }); }); From a667b95b8d2a1730fd7b9c0ed6a32b8d2436c93f Mon Sep 17 00:00:00 2001 From: bmanifold Date: Thu, 26 Oct 2017 16:30:08 -0400 Subject: [PATCH 2/5] Fix box inside box collapsing error (#1681) (#1685) * Previously, with a .box inside a .box, any clicking on a collapse/expand button in either .box would cause both of them to collapse/expand. This commit makes sure parent and child boxes do not interfere with each other. --- build/js/BoxWidget.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build/js/BoxWidget.js b/build/js/BoxWidget.js index 240518e0a..bbbaec0de 100644 --- a/build/js/BoxWidget.js +++ b/build/js/BoxWidget.js @@ -23,6 +23,7 @@ var Selector = { data : '.box', collapsed: '.collapsed-box', + header : '.box-header', body : '.box-body', footer : '.box-footer', tools : '.box-tools' @@ -65,12 +66,13 @@ $(this.element).removeClass(ClassName.collapsed) $(this.element) - .find(Selector.tools) + .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer) + .children(Selector.tools) .find('.' + expandIcon) .removeClass(expandIcon) .addClass(collapseIcon) - $(this.element).find(Selector.body + ', ' + Selector.footer) + $(this.element).children(Selector.body + ', ' + Selector.footer) .slideDown(this.options.animationSpeed, function () { $(this.element).trigger(expandedEvent) }.bind(this)) @@ -82,12 +84,13 @@ var expandIcon = this.options.expandIcon $(this.element) - .find(Selector.tools) + .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer) + .children(Selector.tools) .find('.' + collapseIcon) .removeClass(collapseIcon) .addClass(expandIcon) - $(this.element).find(Selector.body + ', ' + Selector.footer) + $(this.element).children(Selector.body + ', ' + Selector.footer) .slideUp(this.options.animationSpeed, function () { $(this.element).addClass(ClassName.collapsed) $(this.element).trigger(collapsedEvent) @@ -110,12 +113,14 @@ $(this.element).on('click', this.options.collapseTrigger, function (event) { if (event) event.preventDefault() - that.toggle() + that.toggle($(this)) + return false }) $(this.element).on('click', this.options.removeTrigger, function (event) { if (event) event.preventDefault() - that.remove() + that.remove($(this)) + return false }) } From f0421f5b364d61809563bc971eef51fd510ac0ef Mon Sep 17 00:00:00 2001 From: Howard Gehring Date: Thu, 26 Oct 2017 16:31:13 -0400 Subject: [PATCH 3/5] Composer installer support (#1619) * Update composer.json Adding support for composer custom install path * Update composer.json --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index e6f033482..79bf0f54a 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,7 @@ "name": "almasaeed2010/adminlte", "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3", "homepage": "https://adminlte.io/", + "type": "template", "keywords": [ "css", "js", @@ -22,5 +23,8 @@ "license": "MIT", "support": { "issues": "https://github.com/almasaeed2010/AdminLTE/issues" + }, + "require": { + "composer/installers": "1.*" } } From c3fb2e2bcd0cd688cf7d226c20d64804f7171ea5 Mon Sep 17 00:00:00 2001 From: msalasch Date: Thu, 26 Oct 2017 14:39:28 -0600 Subject: [PATCH 4/5] corrected error in the chart path in the charts pages (#1581) --- pages/charts/chartjs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html index 77c01afd4..ade25b8fe 100644 --- a/pages/charts/chartjs.html +++ b/pages/charts/chartjs.html @@ -704,7 +704,7 @@ - + From 53393404f17e09f8b4921a0a8a6596858bf921bc Mon Sep 17 00:00:00 2001 From: ADmad Date: Fri, 27 Oct 2017 02:18:52 +0530 Subject: [PATCH 5/5] Don't hardcode slimscroll options. (#1605) --- build/js/Layout.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/js/Layout.js b/build/js/Layout.js index d519cff3b..c5c3b8fc8 100644 --- a/build/js/Layout.js +++ b/build/js/Layout.js @@ -130,9 +130,7 @@ // Add slimscroll $(Selector.sidebar).slimScroll({ - height: ($(window).height() - $(Selector.mainHeader).height()) + 'px', - color : 'rgba(0,0,0,0.2)', - size : '3px' + height: ($(window).height() - $(Selector.mainHeader).height()) + 'px' }) } }