Skip to content

Commit

Permalink
Merge branch 'QA_5_0'
Browse files Browse the repository at this point in the history 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
@MauricioFauth
MauricioFauth committed Jul 12, 2019
2 parents bc36d42 + 9f06a13 commit 37d1c88
Show file tree
Hide file tree
Showing 94 changed files with 17,068 additions and 13,061 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.json
View file
Expand Up @@ -39,6 +39,8 @@
"no-new-func": "error",
"no-new-object": "error",
"no-param-reassign": "error",
"no-prototype-builtins": "off",
"no-redeclare": ["error", { "builtinGlobals": false }],
"no-trailing-spaces": "error",
"no-underscore-dangle": "error",
"no-unneeded-ternary": "error",
Expand Down
4 changes: 2 additions & 2 deletions js/vendor/codemirror/addon/hint/show-hint.js
View file
Expand Up @@ -239,8 +239,8 @@
var offsetParent = isContainerPositioned ? container : container.offsetParent;
var offsetParentPosition = offsetParent.getBoundingClientRect();
var bodyPosition = ownerDocument.body.getBoundingClientRect();
offsetLeft = (offsetParentPosition.left - bodyPosition.left);
offsetTop = (offsetParentPosition.top - bodyPosition.top);
offsetLeft = (offsetParentPosition.left - bodyPosition.left - offsetParent.scrollLeft);
offsetTop = (offsetParentPosition.top - bodyPosition.top - offsetParent.scrollTop);
}
hints.style.left = (left - offsetLeft) + "px";
hints.style.top = (top - offsetTop) + "px";
Expand Down
19 changes: 13 additions & 6 deletions js/vendor/codemirror/lib/codemirror.js
View file
Expand Up @@ -5147,8 +5147,15 @@
var line = getLine(doc, pos.line);
if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
var sp = line.markedSpans[i], m = sp.marker;
if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
(sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {

// Determine if we should prevent the cursor being placed to the left/right of an atomic marker
// Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
// is with selectLeft/Right
var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;
var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;

if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
(sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
if (mayClear) {
signal(m, "beforeCursorEnter");
if (m.explicitlyCleared) {
Expand All @@ -5160,14 +5167,14 @@

if (oldPos) {
var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
if (dir < 0 ? preventCursorRight : preventCursorLeft)
{ near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
{ return skipAtomicInner(doc, near, pos, dir, mayClear) }
}

var far = m.find(dir < 0 ? -1 : 1);
if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
if (dir < 0 ? preventCursorLeft : preventCursorRight)
{ far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
}
Expand Down Expand Up @@ -7700,7 +7707,7 @@
for (var i = newBreaks.length - 1; i >= 0; i--)
{ replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
});
option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
if (old != Init) { cm.refresh(); }
});
Expand Down Expand Up @@ -9748,7 +9755,7 @@

addLegacyProps(CodeMirror);

CodeMirror.version = "5.47.0";
CodeMirror.version = "5.48.0";

return CodeMirror;

Expand Down
7 changes: 5 additions & 2 deletions js/vendor/codemirror/mode/javascript/javascript.js
View file
Expand Up @@ -525,7 +525,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
cx.marked = "keyword"
return cont(objprop)
} else if (type == "[") {
return cont(expression, maybetype, expect("]"), afterprop);
return cont(expression, maybetypeOrIn, expect("]"), afterprop);
} else if (type == "spread") {
return cont(expressionNoComma, afterprop);
} else if (value == "*") {
Expand Down Expand Up @@ -574,10 +574,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
}
function maybetype(type, value) {
if (isTS) {
if (type == ":" || value == "in") return cont(typeexpr);
if (type == ":") return cont(typeexpr);
if (value == "?") return cont(maybetype);
}
}
function maybetypeOrIn(type, value) {
if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
}
function mayberettype(type) {
if (isTS && type == ":") {
if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
Expand Down
102 changes: 77 additions & 25 deletions js/vendor/jquery/jquery-migrate.js
View file
@@ -1,12 +1,14 @@
/*!
* jQuery Migrate - v3.0.1 - 2017-09-26
* Copyright jQuery Foundation and other contributors
*/
/*!
* jQuery Migrate - v3.1.0 - 2019-06-08
* Copyright OpenJS Foundation and other contributors
*/
;( function( factory ) {
if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
define( [ "jquery" ], window, factory );
define( [ "jquery" ], function ( jQuery ) {
return factory( jQuery, window );
} );
} else if ( typeof module === "object" && module.exports ) {

// Node/CommonJS
Expand All @@ -19,16 +21,37 @@
}
} )( function( jQuery, window ) {
"use strict";


jQuery.migrateVersion = "3.1.0";

/* exported jQueryVersionSince, compareVersions */

jQuery.migrateVersion = "3.0.1";
// Returns 0 if v1 == v2, -1 if v1 < v2, 1 if v1 > v2
function compareVersions( v1, v2 ) {
var rVersionParts = /^(\d+)\.(\d+)\.(\d+)/,
v1p = rVersionParts.exec( v1 ) || [ ],
v2p = rVersionParts.exec( v2 ) || [ ];

for ( var i = 1; i <= 3; i++ ) {
if ( +v1p[ i ] > +v2p[ i ] ) {
return 1;
}
if ( +v1p[ i ] < +v2p[ i ] ) {
return -1;
}
}
return 0;
}

function jQueryVersionSince( version ) {
return compareVersions( jQuery.fn.jquery, version ) >= 0;
}

/* exported migrateWarn, migrateWarnFunc, migrateWarnProp */

( function() {

var rbadVersions = /^[12]\./;

// Support: IE9 only
// IE9 only creates console object when dev tools are first opened
// IE9 console is a host object, callable but doesn't have .apply()
Expand All @@ -37,7 +60,7 @@ jQuery.migrateVersion = "3.0.1";
}

// Need jQuery 3.0.0+ and no older Migrate loaded
if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) {
if ( !jQuery || !jQueryVersionSince( "3.0.0" ) ) {
window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" );
}
if ( jQuery.migrateWarnings ) {
Expand Down Expand Up @@ -108,7 +131,7 @@ if ( window.document.compatMode === "BackCompat" ) {
// JQuery has never supported or tested Quirks Mode
migrateWarn( "jQuery is not compatible with Quirks Mode" );
}



var oldInit = jQuery.fn.init,
oldIsNumeric = jQuery.isNumeric,
Expand Down Expand Up @@ -200,6 +223,15 @@ jQuery.isNumeric = function( val ) {
return oldValue;
};

if ( jQueryVersionSince( "3.3.0" ) ) {
migrateWarnFunc( jQuery, "isWindow",
function( obj ) {
return obj != null && obj === obj.window;
},
"jQuery.isWindow() is deprecated"
);
}

migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady,
"jQuery.holdReady is deprecated" );

Expand All @@ -212,6 +244,12 @@ migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos" );

// Prior to jQuery 3.2 there were internal refs so we don't warn there
if ( jQueryVersionSince( "3.2.0" ) ) {
migrateWarnFunc( jQuery, "nodeName", jQuery.nodeName,
"jQuery.nodeName is deprecated" );
}


var oldAjax = jQuery.ajax;

Expand All @@ -230,7 +268,7 @@ jQuery.ajax = function( ) {

return jQXHR;
};



var oldRemoveAttr = jQuery.fn.removeAttr,
oldToggleClass = jQuery.fn.toggleClass,
Expand All @@ -239,7 +277,7 @@ var oldRemoveAttr = jQuery.fn.removeAttr,
jQuery.fn.removeAttr = function( name ) {
var self = this;

jQuery.each( name.match( rmatchNonSpace ), function( i, attr ) {
jQuery.each( name.match( rmatchNonSpace ), function( _i, attr ) {
if ( jQuery.expr.match.bool.test( attr ) ) {
migrateWarn( "jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
self.prop( attr, false );
Expand Down Expand Up @@ -279,7 +317,7 @@ jQuery.fn.toggleClass = function( state ) {
}
} );
};



var internalSwapCall = false;

Expand Down Expand Up @@ -324,7 +362,7 @@ jQuery.swap = function( elem, options, callback, args ) {

return ret;
};


var oldData = jQuery.data;

jQuery.data = function( elem, name, value ) {
Expand Down Expand Up @@ -362,7 +400,7 @@ jQuery.data = function( elem, name, value ) {

return oldData.apply( this, arguments );
};


var oldTweenRun = jQuery.Tween.prototype.run;
var linearEasing = function( pct ) {
return pct;
Expand All @@ -380,15 +418,29 @@ jQuery.Tween.prototype.run = function( ) {
oldTweenRun.apply( this, arguments );
};

jQuery.fx.interval = jQuery.fx.interval || 13;
var intervalValue = jQuery.fx.interval || 13,
intervalMsg = "jQuery.fx.interval is deprecated";

// Support: IE9, Android <=4.4
// Avoid false positives on browsers that lack rAF
// Don't warn if document is hidden, jQuery uses setTimeout (#292)
if ( window.requestAnimationFrame ) {
migrateWarnProp( jQuery.fx, "interval", jQuery.fx.interval,
"jQuery.fx.interval is deprecated" );
Object.defineProperty( jQuery.fx, "interval", {
configurable: true,
enumerable: true,
get: function() {
if ( !window.document.hidden ) {
migrateWarn( intervalMsg );
}
return intervalValue;
},
set: function( newValue ) {
migrateWarn( intervalMsg );
intervalValue = newValue;
}
} );
}


var oldLoad = jQuery.fn.load,
oldEventAdd = jQuery.event.add,
originalFix = jQuery.event.fix;
Expand Down Expand Up @@ -469,7 +521,7 @@ jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( i, name ) {
function( _i, name ) {

// Handle event binding
jQuery.fn[ name ] = function( data, fn ) {
Expand Down Expand Up @@ -518,7 +570,7 @@ jQuery.fn.extend( {
return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
}
} );



var oldOffset = jQuery.fn.offset;

Expand All @@ -540,7 +592,7 @@ jQuery.fn.offset = function() {

return oldOffset.apply( this, arguments );
};



var oldParam = jQuery.param;

Expand All @@ -555,14 +607,14 @@ jQuery.param = function( data, traditional ) {

return oldParam.call( this, data, traditional );
};


var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;

jQuery.fn.andSelf = function() {
migrateWarn( "jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
return oldSelf.apply( this, arguments );
};



var oldDeferred = jQuery.Deferred,
tuples = [
Expand Down Expand Up @@ -621,6 +673,6 @@ jQuery.Deferred = function( func ) {

// Preserve handler of uncaught exceptions in promise chains
jQuery.Deferred.exceptionHook = oldDeferred.exceptionHook;


return jQuery;
} );
14 changes: 7 additions & 7 deletions package.json
View file
Expand Up @@ -7,29 +7,29 @@
"license": "GPL-2.0",
"dependencies": {
"bootstrap": "^4.1.3",
"codemirror": "5.47.0",
"codemirror": "5.48.0",
"jquery": "3.4.1",
"jquery-migrate": "3.0.1",
"jquery-migrate": "3.1.0",
"jquery-mousewheel": "3.1.13",
"jquery-ui": "1.12.1",
"jquery-ui-timepicker-addon": "1.6.3",
"jquery-validation": "1.19.1",
"jquery.event.drag": "2.2.2",
"js-cookie": "2.2.0",
"popper.js": "^1.14.6",
"sass": "^1.20.3",
"sass": "^1.22.4",
"tracekit": "0.4.5",
"u2f-api-polyfill": "0.4.4",
"updated-jqplot": "1.0.9",
"zxcvbn": "4.4.2"
},
"devDependencies": {
"eslint": "^5.16.0",
"eslint-plugin-no-jquery": "^2.0.0",
"stylelint": "^10.0.1",
"eslint": "^6.0.1",
"eslint-plugin-no-jquery": "^2.1.0",
"stylelint": "^10.1.0",
"stylelint-config-recommended-scss": "^3.3.0",
"stylelint-config-standard": "^18.3.0",
"stylelint-scss": "^3.7.0"
"stylelint-scss": "^3.9.1"
},
"scripts": {
"postinstall": "yarn run --silent css-compile --quiet --style=compressed",
Expand Down

0 comments on commit 37d1c88

Please sign in to comment.