mirrors/OverlayScrollbars
2
0
Fork 0
mirror of https://github.com/tenrok/OverlayScrollbars.git synced 2026-06-23 05:10:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

version 1.6.2

Browse Source
This commit is contained in:
Rene
2019-01-16 20:28:18 +01:00
parent 5defc13659
commit 0f138c1a63
8 changed files with 130 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/OverlayScrollbars.css
+21 -10
View File
@@ -2,13 +2,13 @@
* OverlayScrollbars * OverlayScrollbars
* https://github.com/KingSora/OverlayScrollbars * https://github.com/KingSora/OverlayScrollbars
* *
* Version: 1.6.1 * Version: 1.6.2
* *
* Copyright KingSora. * Copyright KingSora.
* https://github.com/KingSora * https://github.com/KingSora
* *
* Released under the MIT license. * Released under the MIT license.
* Date: 16.12.2018 * Date: 16.01.2019
*/ */
/* /*
@@ -171,20 +171,31 @@ body.os-dragging * {
.os-content > .os-textarea { .os-content > .os-textarea {
box-sizing: border-box !important; box-sizing: border-box !important;
direction: inherit !important; direction: inherit !important;
float: none !important;
margin: 0 !important;
max-height: none !important;
max-width: none !important;
border: none !important;
border-radius: 0px !important;
background: transparent !important; background: transparent !important;
outline: 0px none transparent !important; outline: 0px none transparent !important;
overflow: hidden !important; overflow: hidden !important;
resize: none !important;
position: absolute !important; position: absolute !important;
display: block !important;
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
z-index: 1; margin: 0 !important;
border-radius: 0px !important;
float: none !important;
-webkit-filter: none !important;
filter: none !important;
border: none !important;
resize: none !important;
-webkit-transform: none !important;
transform: none !important;
max-width: none !important;
max-height: none !important;
box-shadow: none !important;
-webkit-perspective: none !important;
perspective: none !important;
opacity: 1 !important;
z-index: 1 !important;
clip: auto !important;
vertical-align: baseline !important;
padding: 0px; padding: 0px;
} }
.os-host-rtl > .os-padding > .os-viewport > .os-content > .os-textarea { .os-host-rtl > .os-padding > .os-viewport > .os-content > .os-textarea {
css/OverlayScrollbars.min.css
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long
js/OverlayScrollbars.js
+35 -17
View File
@@ -2,13 +2,13 @@
* OverlayScrollbars * OverlayScrollbars
* https://github.com/KingSora/OverlayScrollbars * https://github.com/KingSora/OverlayScrollbars
* *
* Version: 1.6.1 * Version: 1.6.2
* *
* Copyright KingSora. * Copyright KingSora.
* https://github.com/KingSora * https://github.com/KingSora
* *
* Released under the MIT license. * Released under the MIT license.
* Date: 16.12.2018 * Date: 16.01.2019
*/ */
(function (global, factory) { (function (global, factory) {
@@ -22,6 +22,7 @@
function(window, document, undefined) { function(window, document, undefined) {
'use strict'; 'use strict';
var PLUGINNAME = 'OverlayScrollbars'; var PLUGINNAME = 'OverlayScrollbars';
var text = { };
var TYPES = { var TYPES = {
o : 'object', o : 'object',
f : 'function', f : 'function',
@@ -1492,6 +1493,7 @@
var isValid = false; var isValid = false;
var templateValue = template[prop]; var templateValue = template[prop];
var templateValueType = COMPATIBILITY.type(templateValue); var templateValueType = COMPATIBILITY.type(templateValue);
var templateIsComplext = templateValueType == TYPES.o;
var templateTypes = COMPATIBILITY.type(templateValue) != TYPES.a ? [ templateValue ] : templateValue; var templateTypes = COMPATIBILITY.type(templateValue) != TYPES.a ? [ templateValue ] : templateValue;
var dataValue = data[prop]; var dataValue = data[prop];
var dataValueType = COMPATIBILITY.type(dataValue); var dataValueType = COMPATIBILITY.type(dataValue);
@@ -1509,13 +1511,13 @@
var j; var j;
//if the template has a object as value, it means that the options are complex (verschachtelt) //if the template has a object as value, it means that the options are complex (verschachtelt)
if(templateValueType == TYPES.o) { if(templateIsComplext && dataValueType == TYPES.o) {
validatedOptions[prop] = { }; validatedOptions[prop] = { };
checkObjectProps(dataValue, templateValue, validatedOptions[prop], propPrefix + prop); checkObjectProps(dataValue, templateValue, validatedOptions[prop], propPrefix + prop);
if(FRAMEWORK.isEmptyObject(dataValue)) if(FRAMEWORK.isEmptyObject(dataValue))
delete data[prop]; delete data[prop];
} }
else { else if(!templateIsComplext) {
for(i = 0; i < templateTypes.length; i++) { for(i = 0; i < templateTypes.length; i++) {
currType = templateTypes[i]; currType = templateTypes[i];
templateValueType = COMPATIBILITY.type(currType); templateValueType = COMPATIBILITY.type(currType);
@@ -1958,6 +1960,7 @@
var _isTextarea; var _isTextarea;
var _isBody; var _isBody;
var _documentMixed; var _documentMixed;
var _isTextareaHostGenerated;
//general: //general:
var _isBorderBox; var _isBorderBox;
@@ -2667,7 +2670,7 @@
* A callback which will be called after a img element has downloaded its src asynchronous. * A callback which will be called after a img element has downloaded its src asynchronous.
*/ */
function imgOnLoad() { function imgOnLoad() {
update(); update(false, true);
} }
@@ -3012,9 +3015,9 @@
clearTimeout(_swallowedUpdateTimeout); clearTimeout(_swallowedUpdateTimeout);
if (swallow) { if (swallow) {
_swallowedUpdateParams.h = hostSizeChanged; _swallowedUpdateParams.h = _swallowedUpdateParams.h || hostSizeChanged;
_swallowedUpdateParams.c = contentSizeChanged; _swallowedUpdateParams.c = _swallowedUpdateParams.c || contentSizeChanged;
_swallowedUpdateParams.f = force; _swallowedUpdateParams.f = _swallowedUpdateParams.f || force;
_swallowedUpdateTimeout = setTimeout(update, _swallowUpdateLag); _swallowedUpdateTimeout = setTimeout(update, _swallowUpdateLag);
} }
@@ -4100,6 +4103,8 @@
_classNameHostOverflowX, _classNameHostOverflowX,
_classNameHostOverflowY, _classNameHostOverflowY,
_classNameThemeNone, _classNameThemeNone,
_classNameTextareaElement,
_classNameTextInherit,
_classNameCache].join(_strSpace); _classNameCache].join(_strSpace);
adoptAttrs = type(adoptAttrs) == TYPES.s ? adoptAttrs.split(' ') : adoptAttrs; adoptAttrs = type(adoptAttrs) == TYPES.s ? adoptAttrs.split(' ') : adoptAttrs;
if(type(adoptAttrs) == TYPES.a) { if(type(adoptAttrs) == TYPES.a) {
@@ -4112,11 +4117,16 @@
if(!destroy) { if(!destroy) {
if (_isTextarea) { if (_isTextarea) {
var hostElementCSS = {}; var hostElementCSS = {};
var parent = _targetElement.parent();
_isTextareaHostGenerated = !(parent.hasClass(_classNameHostTextareaElement) && parent.children()[LEXICON.l] === 1);
if (!_currentPreparedOptions.sizeAutoCapable) { if (!_currentPreparedOptions.sizeAutoCapable) {
hostElementCSS[_strWidth] = _targetElement.css(_strWidth); hostElementCSS[_strWidth] = _targetElement.css(_strWidth);
hostElementCSS[_strHeight] = _targetElement.css(_strHeight); hostElementCSS[_strHeight] = _targetElement.css(_strHeight);
} }
_targetElement.wrap(generateDiv(_classNameHostTextareaElement)); if(_isTextareaHostGenerated)
_targetElement.wrap(generateDiv(_classNameHostTextareaElement));
_hostElement = _targetElement.parent(); _hostElement = _targetElement.parent();
_hostElement.css(hostElementCSS) _hostElement.css(hostElementCSS)
.wrapInner(generateDiv(_classNameContentElement + _strSpace + _classNameTextInherit)) .wrapInner(generateDiv(_classNameContentElement + _strSpace + _classNameTextInherit))
@@ -4130,7 +4140,8 @@
addClass(_targetElement, _classNameTextareaElement + _strSpace + _classNameTextInherit); addClass(_targetElement, _classNameTextareaElement + _strSpace + _classNameTextInherit);
applyAdoptedAttrs(); if(_isTextareaHostGenerated)
applyAdoptedAttrs();
} }
else { else {
_hostElement = _targetElement; _hostElement = _targetElement;
@@ -4157,20 +4168,27 @@
.unwrap() .unwrap()
.unwrap() .unwrap()
.unwrap(); .unwrap();
removeClass(_hostElement, hostElementClassNames);
if (_isTextarea) { if (_isTextarea) {
_targetElement.removeAttr(LEXICON.s); _targetElement.removeAttr(LEXICON.s);
applyAdoptedAttrs(); if(_isTextareaHostGenerated)
applyAdoptedAttrs();
removeClass(_targetElement, hostElementClassNames + _strSpace + _classNameTextareaElement + _strSpace + _classNameTextInherit) removeClass(_targetElement, hostElementClassNames);
.unwrap();
remove(_textareaCoverElement); remove(_textareaCoverElement);
remove(_hostElement);
if(_isTextareaHostGenerated) {
_targetElement.unwrap();
remove(_hostElement);
}
else {
addClass(_hostElement, _classNameHostTextareaElement);
}
} }
else { else {
removeClass(_targetElement, _classNameHostElement); removeClass(_targetElement, _classNameHostElement);
removeClass(_hostElement, hostElementClassNames);
} }
if (_isBody) if (_isBody)
@@ -5944,7 +5962,7 @@
_rtlScrollBehavior = extend(true, {}, globals.rtlScrollBehavior); _rtlScrollBehavior = extend(true, {}, globals.rtlScrollBehavior);
//parse & set options but don't update //parse & set options but don't update
setOptions(extend(true, { }, _defaultOptions, options)); setOptions(extend(true, { }, _defaultOptions, _pluginsOptions.v(options, _pluginsOptions.t, true)));
//check if the plugin hasn't to be initialized //check if the plugin hasn't to be initialized
if (_nativeScrollbarIsOverlaid.x && _nativeScrollbarIsOverlaid.x && !_currentPreparedOptions.nativeScrollbarsOverlaid.initialize) { if (_nativeScrollbarIsOverlaid.x && _nativeScrollbarIsOverlaid.x && !_currentPreparedOptions.nativeScrollbarsOverlaid.initialize) {
js/OverlayScrollbars.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
js/jquery.overlayScrollbars.js
+34 -17
View File
@@ -2,13 +2,13 @@
* OverlayScrollbars * OverlayScrollbars
* https://github.com/KingSora/OverlayScrollbars * https://github.com/KingSora/OverlayScrollbars
* *
* Version: 1.6.1 * Version: 1.6.2
* *
* Copyright KingSora. * Copyright KingSora.
* https://github.com/KingSora * https://github.com/KingSora
* *
* Released under the MIT license. * Released under the MIT license.
* Date: 16.12.2018 * Date: 16.01.2019
*/ */
(function (global, factory) { (function (global, factory) {
@@ -414,6 +414,7 @@
var isValid = false; var isValid = false;
var templateValue = template[prop]; var templateValue = template[prop];
var templateValueType = COMPATIBILITY.type(templateValue); var templateValueType = COMPATIBILITY.type(templateValue);
var templateIsComplext = templateValueType == TYPES.o;
var templateTypes = COMPATIBILITY.type(templateValue) != TYPES.a ? [ templateValue ] : templateValue; var templateTypes = COMPATIBILITY.type(templateValue) != TYPES.a ? [ templateValue ] : templateValue;
var dataValue = data[prop]; var dataValue = data[prop];
var dataValueType = COMPATIBILITY.type(dataValue); var dataValueType = COMPATIBILITY.type(dataValue);
@@ -431,13 +432,13 @@
var j; var j;
//if the template has a object as value, it means that the options are complex (verschachtelt) //if the template has a object as value, it means that the options are complex (verschachtelt)
if(templateValueType == TYPES.o) { if(templateIsComplext && dataValueType == TYPES.o) {
validatedOptions[prop] = { }; validatedOptions[prop] = { };
checkObjectProps(dataValue, templateValue, validatedOptions[prop], propPrefix + prop); checkObjectProps(dataValue, templateValue, validatedOptions[prop], propPrefix + prop);
if(FRAMEWORK.isEmptyObject(dataValue)) if(FRAMEWORK.isEmptyObject(dataValue))
delete data[prop]; delete data[prop];
} }
else { else if(!templateIsComplext) {
for(i = 0; i < templateTypes.length; i++) { for(i = 0; i < templateTypes.length; i++) {
currType = templateTypes[i]; currType = templateTypes[i];
templateValueType = COMPATIBILITY.type(currType); templateValueType = COMPATIBILITY.type(currType);
@@ -880,6 +881,7 @@
var _isTextarea; var _isTextarea;
var _isBody; var _isBody;
var _documentMixed; var _documentMixed;
var _isTextareaHostGenerated;
//general: //general:
var _isBorderBox; var _isBorderBox;
@@ -1589,7 +1591,7 @@
* A callback which will be called after a img element has downloaded its src asynchronous. * A callback which will be called after a img element has downloaded its src asynchronous.
*/ */
function imgOnLoad() { function imgOnLoad() {
update(); update(false, true);
} }
@@ -1934,9 +1936,9 @@
clearTimeout(_swallowedUpdateTimeout); clearTimeout(_swallowedUpdateTimeout);
if (swallow) { if (swallow) {
_swallowedUpdateParams.h = hostSizeChanged; _swallowedUpdateParams.h = _swallowedUpdateParams.h || hostSizeChanged;
_swallowedUpdateParams.c = contentSizeChanged; _swallowedUpdateParams.c = _swallowedUpdateParams.c || contentSizeChanged;
_swallowedUpdateParams.f = force; _swallowedUpdateParams.f = _swallowedUpdateParams.f || force;
_swallowedUpdateTimeout = setTimeout(update, _swallowUpdateLag); _swallowedUpdateTimeout = setTimeout(update, _swallowUpdateLag);
} }
@@ -3022,6 +3024,8 @@
_classNameHostOverflowX, _classNameHostOverflowX,
_classNameHostOverflowY, _classNameHostOverflowY,
_classNameThemeNone, _classNameThemeNone,
_classNameTextareaElement,
_classNameTextInherit,
_classNameCache].join(_strSpace); _classNameCache].join(_strSpace);
adoptAttrs = type(adoptAttrs) == TYPES.s ? adoptAttrs.split(' ') : adoptAttrs; adoptAttrs = type(adoptAttrs) == TYPES.s ? adoptAttrs.split(' ') : adoptAttrs;
if(type(adoptAttrs) == TYPES.a) { if(type(adoptAttrs) == TYPES.a) {
@@ -3034,11 +3038,16 @@
if(!destroy) { if(!destroy) {
if (_isTextarea) { if (_isTextarea) {
var hostElementCSS = {}; var hostElementCSS = {};
var parent = _targetElement.parent();
_isTextareaHostGenerated = !(parent.hasClass(_classNameHostTextareaElement) && parent.children()[LEXICON.l] === 1);
if (!_currentPreparedOptions.sizeAutoCapable) { if (!_currentPreparedOptions.sizeAutoCapable) {
hostElementCSS[_strWidth] = _targetElement.css(_strWidth); hostElementCSS[_strWidth] = _targetElement.css(_strWidth);
hostElementCSS[_strHeight] = _targetElement.css(_strHeight); hostElementCSS[_strHeight] = _targetElement.css(_strHeight);
} }
_targetElement.wrap(generateDiv(_classNameHostTextareaElement)); if(_isTextareaHostGenerated)
_targetElement.wrap(generateDiv(_classNameHostTextareaElement));
_hostElement = _targetElement.parent(); _hostElement = _targetElement.parent();
_hostElement.css(hostElementCSS) _hostElement.css(hostElementCSS)
.wrapInner(generateDiv(_classNameContentElement + _strSpace + _classNameTextInherit)) .wrapInner(generateDiv(_classNameContentElement + _strSpace + _classNameTextInherit))
@@ -3052,7 +3061,8 @@
addClass(_targetElement, _classNameTextareaElement + _strSpace + _classNameTextInherit); addClass(_targetElement, _classNameTextareaElement + _strSpace + _classNameTextInherit);
applyAdoptedAttrs(); if(_isTextareaHostGenerated)
applyAdoptedAttrs();
} }
else { else {
_hostElement = _targetElement; _hostElement = _targetElement;
@@ -3079,20 +3089,27 @@
.unwrap() .unwrap()
.unwrap() .unwrap()
.unwrap(); .unwrap();
removeClass(_hostElement, hostElementClassNames);
if (_isTextarea) { if (_isTextarea) {
_targetElement.removeAttr(LEXICON.s); _targetElement.removeAttr(LEXICON.s);
applyAdoptedAttrs(); if(_isTextareaHostGenerated)
applyAdoptedAttrs();
removeClass(_targetElement, hostElementClassNames + _strSpace + _classNameTextareaElement + _strSpace + _classNameTextInherit) removeClass(_targetElement, hostElementClassNames);
.unwrap();
remove(_textareaCoverElement); remove(_textareaCoverElement);
remove(_hostElement);
if(_isTextareaHostGenerated) {
_targetElement.unwrap();
remove(_hostElement);
}
else {
addClass(_hostElement, _classNameHostTextareaElement);
}
} }
else { else {
removeClass(_targetElement, _classNameHostElement); removeClass(_targetElement, _classNameHostElement);
removeClass(_hostElement, hostElementClassNames);
} }
if (_isBody) if (_isBody)
@@ -4866,7 +4883,7 @@
_rtlScrollBehavior = extend(true, {}, globals.rtlScrollBehavior); _rtlScrollBehavior = extend(true, {}, globals.rtlScrollBehavior);
//parse & set options but don't update //parse & set options but don't update
setOptions(extend(true, { }, _defaultOptions, options)); setOptions(extend(true, { }, _defaultOptions, _pluginsOptions.v(options, _pluginsOptions.t, true)));
//check if the plugin hasn't to be initialized //check if the plugin hasn't to be initialized
if (_nativeScrollbarIsOverlaid.x && _nativeScrollbarIsOverlaid.x && !_currentPreparedOptions.nativeScrollbarsOverlaid.initialize) { if (_nativeScrollbarIsOverlaid.x && _nativeScrollbarIsOverlaid.x && !_currentPreparedOptions.nativeScrollbarsOverlaid.initialize) {
js/jquery.overlayScrollbars.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
uglify.bat
+4
View File
@@ -0,0 +1,4 @@
:: npm install uglify-js -g
call uglifyjs ./js/OverlayScrollbars.js -o ./js/OverlayScrollbars.min.js -c -m --mangle-props regex="/^_/" --ie8 --config-file uglify.json
call uglifyjs ./js/jquery.overlayScrollbars.js -o ./js/jquery.overlayScrollbars.min.js -c -m --mangle-props regex="/^_/" --ie8 --config-file uglify.json
pause
uglify.json
+26
View File
@@ -0,0 +1,26 @@
{
"parse":{
},
"compress":{
"ie8":true,
"passes":2,
"reduce_vars":false,
"typeofs":false
},
"mangle":{
"ie8":true,
"properties":{
"regex":"/^_/"
}
},
"output":{
"ie8":true,
"beautify":false,
"comments":"/@license|@preserve|^!/",
"indent_level":4,
"indent_start":0,
"quote_style":0
},
"ie8":true
}