github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issue with extending $.AdminLTE.options

pull/399/head
Abdullah Almsaeed 2015-05-06 23:59:51 -04:00
parent c0280e2819
commit d72176caa7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/js/app.js vendored
View File

@ -138,7 +138,7 @@ $.AdminLTE.options = {
$(function () { $(function () {
//Extend options if external options exist //Extend options if external options exist
if (typeof AdminLTEOptions !== "undefined") { if (typeof AdminLTEOptions !== "undefined") {
$.AdminLTE.options = $.extend({}, $.extend(true,
$.AdminLTE.options, $.AdminLTE.options,
AdminLTEOptions); AdminLTEOptions);
} }
@ -476,8 +476,8 @@ function _init() {
if (slide) { if (slide) {
sidebar.addClass('control-sidebar-open'); sidebar.addClass('control-sidebar-open');
$(document).on('click', function () { $(document).on('click', function () {
_this.close(sidebar, slide); _this.close(sidebar, slide);
}); });
} else { } else {
//Push the content by adding the open class to the body instead //Push the content by adding the open class to the body instead
//of the sidebar itself //of the sidebar itself

2
dist/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long