maxmustermann/AdminLTE
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

slimscroll implementation o v3

Browse source
This commit is contained in:
Jorge Vilaça 2019-03-24 12:58:28 -04:00
parent 7e09433c4d
commit 654f5b169d
10 changed files with 221 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ bower_components
ad.js
TODO
test.html
.vscode/

29
build/js/Layout.js
View file

@ -21,8 +21,8 @@ const Layout = (($) => {
}
const Selector = {
SIDEBAR : '.main-sidebar',
HEADER : '.main-header',
SIDEBAR : '.main-sidebar .sidebar',
CONTENT : '.content-wrapper',
CONTENT_HEADER : '.content-header',
WRAPPER : '.wrapper',
@ -53,15 +53,26 @@ const Layout = (($) => {
fixLayoutHeight() {
const heights = {
window : $(window).height(),
header : $(Selector.HEADER).outerHeight(),
footer : $(Selector.FOOTER).outerHeight(),
sidebar: $(Selector.SIDEBAR).height()
window : $(window).height(),
header : $(Selector.HEADER).outerHeight(),
footer : $(Selector.FOOTER).outerHeight(),
sidebar : $(Selector.SIDEBAR).height(),
}
const max = this._max(heights)
console.log(heights);
const max = this._max(heights)
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)
$(Selector.SIDEBAR).css('min-height', max - heights.header)
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
if (typeof $.fn.slimScroll !== 'undefined') {
$(Selector.SIDEBAR)
.slimScroll({ destroy: true })
.slimScroll({ height: max - heights.header });
}
}
}
// Private
@ -78,6 +89,8 @@ const Layout = (($) => {
})
$(window).resize(() => {
console.log('resized');
this.fixLayoutHeight()
})
@ -131,7 +144,7 @@ const Layout = (($) => {
$.fn[NAME] = Layout._jQueryInterface
$.fn[NAME].Constructor = Layout
$.fn[NAME].noConflict = function () {
$.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT
return Layout._jQueryInterface
}
@ -139,4 +152,4 @@ const Layout = (($) => {
return Layout
})(jQuery)
export default Layout
export default Layout

36
dist/css/adminlte.css vendored
View file

@ -11597,7 +11597,7 @@ label:not(.form-check-label):not(.custom-file-label) {
color: #6c757d;
}
.nav-pills .nav-link:not(.active):hover {
.nav-pills .nav-link:not(.active):not(.dropdown-toggle):hover {
color: #007bff;
}
@ -12262,10 +12262,44 @@ label:not(.form-check-label):not(.custom-file-label) {
border-right: none;
}
.login-card-body .input-group .form-control:focus,
.register-card-body .input-group .form-control:focus {
box-shadow: none;
}
.login-card-body .input-group .form-control:focus ~ .input-group-append .input-group-text,
.register-card-body .input-group .form-control:focus ~ .input-group-append .input-group-text {
border-color: #80bdff;
}
.login-card-body .input-group .form-control.is-valid:focus,
.register-card-body .input-group .form-control.is-valid:focus {
box-shadow: none;
}
.login-card-body .input-group .form-control.is-valid ~ .input-group-append .input-group-text,
.register-card-body .input-group .form-control.is-valid ~ .input-group-append .input-group-text {
border-color: #28a745;
}
.login-card-body .input-group .form-control.is-invalid:focus,
.register-card-body .input-group .form-control.is-invalid:focus {
box-shadow: none;
}
.login-card-body .input-group .form-control.is-invalid ~ .input-group-append .input-group-text,
.register-card-body .input-group .form-control.is-invalid ~ .input-group-append .input-group-text {
border-color: #dc3545;
}
.login-card-body .input-group .input-group-text,
.register-card-body .input-group .input-group-text {
color: #777;
background-color: transparent;
border-left: none;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
border-bottom-right-radius: 0.25rem !important;
border-top-right-radius: 0.25rem !important;
}
.login-box-msg,

82
dist/css/adminlte.css.map vendored
View file

File diff suppressed because one or more lines are too long

2
dist/css/adminlte.min.css vendored
View file

File diff suppressed because one or more lines are too long

28
dist/js/adminlte.js vendored
View file

@ -1,6 +1,6 @@
/*!
* AdminLTE v3.0.0-beta.1 (https://adminlte.io)
* Copyright 2014-2018 Abdullah Almsaeed <abdullah@almsaeedstudio.com>
* Copyright 2014-2019 Abdullah Almsaeed <abdullah@almsaeedstudio.com>
* Licensed under MIT (https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE)
*/
(function (global, factory) {
@ -188,8 +188,8 @@ var Layout = function ($) {
var JQUERY_NO_CONFLICT = $.fn[NAME];
var Selector = {
SIDEBAR: '.main-sidebar',
HEADER: '.main-header',
SIDEBAR: '.main-sidebar .sidebar',
CONTENT: '.content-wrapper',
CONTENT_HEADER: '.content-header',
WRAPPER: '.wrapper',
@ -227,10 +227,18 @@ var Layout = function ($) {
footer: $(Selector.FOOTER).outerHeight(),
sidebar: $(Selector.SIDEBAR).height()
};
console.log(heights);
var max = this._max(heights);
$(Selector.CONTENT).css('min-height', max - heights.header);
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);
$(Selector.SIDEBAR).css('min-height', max - heights.header);
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
if (typeof $.fn.slimScroll !== 'undefined') {
$(Selector.SIDEBAR).slimScroll({ destroy: true }).slimScroll({ height: max - heights.header });
}
}
};
// Private
@ -248,6 +256,8 @@ var Layout = function ($) {
});
$(window).resize(function () {
console.log('resized');
_this.fixLayoutHeight();
});
@ -674,11 +684,15 @@ var Widget = function ($) {
CARD_HEADER: '.card-header',
CARD_BODY: '.card-body',
CARD_FOOTER: '.card-footer',
COLLAPSED: '.collapsed-card'
COLLAPSED: '.collapsed-card',
COLLAPSE_ICON: '.fa-minus',
EXPAND_ICON: '.fa-plus'
};
var ClassName = {
COLLAPSED: 'collapsed-card'
COLLAPSED: 'collapsed-card',
COLLAPSE_ICON: 'fa-minus',
EXPAND_ICON: 'fa-plus'
};
var Default = {
@ -703,6 +717,8 @@ var Widget = function ($) {
_this._parent.addClass(ClassName.COLLAPSED);
});
this._element.children(Selector.COLLAPSE_ICON).addClass(ClassName.EXPAND_ICON).removeClass(ClassName.COLLAPSE_ICON);
var collapsed = $.Event(Event.COLLAPSED);
this._element.trigger(collapsed, this._parent);
@ -715,6 +731,8 @@ var Widget = function ($) {
_this2._parent.removeClass(ClassName.COLLAPSED);
});
this._element.children(Selector.EXPAND_ICON).addClass(ClassName.COLLAPSE_ICON).removeClass(ClassName.EXPAND_ICON);
var expanded = $.Event(Event.EXPANDED);
this._element.trigger(expanded, this._parent);

2
dist/js/adminlte.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/js/adminlte.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js.map vendored
View file

File diff suppressed because one or more lines are too long

128
package-lock.json generated
View file

@ -3267,7 +3267,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.1.1",
@ -3318,7 +3319,8 @@
"balanced-match": {
"version": "0.4.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"bcrypt-pbkdf": {
"version": "1.0.1",
@ -3333,6 +3335,7 @@
"version": "0.0.9",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"inherits": "~2.0.0"
}
@ -3341,6 +3344,7 @@
"version": "2.10.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"hoek": "2.x.x"
}
@ -3349,6 +3353,7 @@
"version": "1.1.7",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^0.4.1",
"concat-map": "0.0.1"
@ -3357,7 +3362,8 @@
"buffer-shims": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"caseless": {
"version": "0.12.0",
@ -3374,12 +3380,14 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"combined-stream": {
"version": "1.0.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"delayed-stream": "~1.0.0"
}
@ -3387,22 +3395,26 @@
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"cryptiles": {
"version": "2.0.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"boom": "2.x.x"
}
@ -3442,7 +3454,8 @@
"delayed-stream": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
@ -3474,7 +3487,8 @@
"extsprintf": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"forever-agent": {
"version": "0.6.1",
@ -3496,12 +3510,14 @@
"fs.realpath": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"fstream": {
"version": "1.0.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"graceful-fs": "^4.1.2",
"inherits": "~2.0.0",
@ -3557,6 +3573,7 @@
"version": "7.1.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@ -3569,7 +3586,8 @@
"graceful-fs": {
"version": "4.1.11",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"har-schema": {
"version": "1.0.5",
@ -3597,6 +3615,7 @@
"version": "3.1.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"boom": "2.x.x",
"cryptiles": "2.x.x",
@ -3607,7 +3626,8 @@
"hoek": {
"version": "2.16.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"http-signature": {
"version": "1.1.1",
@ -3624,6 +3644,7 @@
"version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@ -3632,7 +3653,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.4",
@ -3644,6 +3666,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -3657,7 +3680,8 @@
"isarray": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"isstream": {
"version": "0.1.2",
@ -3730,12 +3754,14 @@
"mime-db": {
"version": "1.27.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"mime-types": {
"version": "2.1.15",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"mime-db": "~1.27.0"
}
@ -3744,6 +3770,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -3751,12 +3778,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -3811,7 +3840,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"oauth-sign": {
"version": "0.8.2",
@ -3829,6 +3859,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -3858,7 +3889,8 @@
"path-is-absolute": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"performance-now": {
"version": "0.2.0",
@ -3869,7 +3901,8 @@
"process-nextick-args": {
"version": "1.0.7",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"punycode": {
"version": "1.4.1",
@ -3907,6 +3940,7 @@
"version": "2.2.9",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"buffer-shims": "~1.0.0",
"core-util-is": "~1.0.0",
@ -3951,6 +3985,7 @@
"version": "2.6.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"glob": "^7.0.5"
}
@ -3958,7 +3993,8 @@
"safe-buffer": {
"version": "5.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"semver": {
"version": "5.3.0",
@ -3982,6 +4018,7 @@
"version": "1.0.9",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"hoek": "2.x.x"
}
@ -4015,6 +4052,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -4025,6 +4063,7 @@
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.0.1"
}
@ -4039,6 +4078,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -4053,6 +4093,7 @@
"version": "2.2.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"block-stream": "*",
"fstream": "^1.0.2",
@ -4108,7 +4149,8 @@
"util-deprecate": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"uuid": {
"version": "3.0.1",
@ -4137,7 +4179,8 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
@ -6217,7 +6260,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@ -6238,12 +6282,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -6258,17 +6304,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -6385,7 +6434,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -6397,6 +6447,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -6411,6 +6462,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -6418,12 +6470,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -6442,6 +6496,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -6522,7 +6577,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -6534,6 +6590,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -6619,7 +6676,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@ -6655,6 +6713,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -6674,6 +6733,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -6717,12 +6777,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},