Imported Debian patch 4.7.2-3
This commit is contained in:
Timo Aaltonen
committed by
Mario Fetka
Mario Fetka
parent
27edeba051
commit
8bc559c5a1
@@ -1,5 +1,5 @@
|
||||
build.js is builded dojo builder, with applied patches from 'patches' folder, by
|
||||
itself and compiled using python3-rjsmin
|
||||
itself and compiled using uglify.js
|
||||
|
||||
_base/configRhino.js is unmodifed file from dojo/dojo. Required for a build to work.
|
||||
|
||||
@@ -9,4 +9,4 @@ Available via Academic Free License >= 2.1 OR the modified BSD license.
|
||||
see: http://dojotoolkit.org/license for details
|
||||
|
||||
= License =
|
||||
Full Dojo license is in LICENSE file.
|
||||
Full Dojo license is in LICENSE file.
|
||||
@@ -23,20 +23,17 @@ set -o errexit
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
RDIR=$DIR/../release
|
||||
|
||||
# for platform ID
|
||||
. /etc/os-release
|
||||
|
||||
usage() {
|
||||
cat <<-__EOF__;
|
||||
NAME
|
||||
compile.sh - Compiles layer file of Dojo build using Python rjsmin.
|
||||
compile.sh - Compiles layer file of Dojo build using uglify.js.
|
||||
Deletes all other files.
|
||||
|
||||
SYNOPSIS
|
||||
path/to/compile.sh [--help] --release RELEASE --layer NAME/NAME
|
||||
|
||||
DESCRIPTION
|
||||
Compiles layer file of Dojo build output using Python rjsmin.
|
||||
Compiles layer file of Dojo build output using uglify.js.
|
||||
Deletes all other files.
|
||||
|
||||
OPTIONS
|
||||
@@ -108,13 +105,7 @@ if [[ ! $OUTPUT_FILE ]] ; then
|
||||
OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
|
||||
fi
|
||||
|
||||
# compile using python rjsmin on most platforms and uglify-js on RHEL 8
|
||||
# compile using uglifyjs
|
||||
echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
|
||||
echo "Target file: $OUTPUT_FILE"
|
||||
if [ $ID = "rhel" ]; then
|
||||
echo "Minifier: uglifyjs"
|
||||
uglifyjs < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
|
||||
else
|
||||
echo "Minifier: rjsmin"
|
||||
${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
|
||||
fi
|
||||
uglifyjs $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 1d61fd9407e6fbe82fe55cb0b938307aa0791f77 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
|
||||
<m.goleb@gmail.com>
|
||||
Date: Mon, 16 Mar 2020 21:49:29 +0100
|
||||
Subject: [PATCH] Manipulation: Make jQuery.htmlPrefilter an identity function
|
||||
|
||||
Closes gh-4642
|
||||
|
||||
(cherry picked from 90fed4b453a5becdb7f173d9e3c1492390a1441f)
|
||||
---
|
||||
src/manipulation.js | 9 +--------
|
||||
1 file changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/manipulation.js b/src/manipulation.js
|
||||
index 017345af..dec21ea0 100644
|
||||
--- a/src/manipulation.js
|
||||
+++ b/src/manipulation.js
|
||||
@@ -33,13 +33,6 @@ define( [
|
||||
|
||||
var
|
||||
|
||||
- /* eslint-disable max-len */
|
||||
-
|
||||
- // See https://github.com/eslint/eslint/issues/3229
|
||||
- rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
|
||||
-
|
||||
- /* eslint-enable */
|
||||
-
|
||||
// Support: IE <=10 - 11, Edge 12 - 13 only
|
||||
// In IE/Edge using regex groups here causes severe slowdowns.
|
||||
// See https://connect.microsoft.com/IE/feedback/details/1736512/
|
||||
@@ -236,7 +229,7 @@ function remove( elem, selector, keepData ) {
|
||||
|
||||
jQuery.extend( {
|
||||
htmlPrefilter: function( html ) {
|
||||
- return html.replace( rxhtmlTag, "<$1></$2>" );
|
||||
+ return html;
|
||||
},
|
||||
|
||||
clone: function( elem, dataAndEvents, deepDataAndEvents ) {
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
From 966a70909019aa09632c87c0002c522fa4a1e30e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
|
||||
<m.goleb@gmail.com>
|
||||
Date: Mon, 30 Mar 2020 20:15:09 +0200
|
||||
Subject: [PATCH] Manipulation: Skip the select wrapper for <option> outside of
|
||||
IE 9
|
||||
|
||||
Closes gh-4647
|
||||
---
|
||||
src/manipulation/support.js | 6 ++++++
|
||||
src/manipulation/wrapMap.js | 15 ++++++++-------
|
||||
2 files changed, 14 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/manipulation/support.js b/src/manipulation/support.js
|
||||
index 4a5d9af4..62d6bb3e 100644
|
||||
--- a/src/manipulation/support.js
|
||||
+++ b/src/manipulation/support.js
|
||||
@@ -28,6 +28,12 @@ define( [
|
||||
// Make sure textarea (and checkbox) defaultValue is properly cloned
|
||||
div.innerHTML = "<textarea>x</textarea>";
|
||||
support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
|
||||
+
|
||||
+ // Support: IE <=9 only
|
||||
+ // IE <=9 replaces <option> tags with their contents when inserted outside of
|
||||
+ // the select element.
|
||||
+ div.innerHTML = "<option></option>";
|
||||
+ support.option = !!div.lastChild;
|
||||
} )();
|
||||
|
||||
return support;
|
||||
diff --git a/src/manipulation/wrapMap.js b/src/manipulation/wrapMap.js
|
||||
index 1f446f7d..da48bf9f 100644
|
||||
--- a/src/manipulation/wrapMap.js
|
||||
+++ b/src/manipulation/wrapMap.js
|
||||
@@ -1,13 +1,12 @@
|
||||
-define( function() {
|
||||
+define( [
|
||||
+ "./support"
|
||||
+], function( support ) {
|
||||
|
||||
"use strict";
|
||||
|
||||
// We have to close these tags to support XHTML (#13200)
|
||||
var wrapMap = {
|
||||
|
||||
- // Support: IE <=9 only
|
||||
- option: [ 1, "<select multiple='multiple'>", "</select>" ],
|
||||
-
|
||||
// XHTML parsers do not magically insert elements in the
|
||||
// same way that tag soup parsers do. So we cannot shorten
|
||||
// this by omitting <tbody> or other required elements.
|
||||
@@ -19,11 +18,13 @@ var wrapMap = {
|
||||
_default: [ 0, "", "" ]
|
||||
};
|
||||
|
||||
-// Support: IE <=9 only
|
||||
-wrapMap.optgroup = wrapMap.option;
|
||||
-
|
||||
wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
|
||||
wrapMap.th = wrapMap.td;
|
||||
|
||||
+// Support: IE <=9 only
|
||||
+if ( !support.option ) {
|
||||
+ wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
|
||||
+}
|
||||
+
|
||||
return wrapMap;
|
||||
} );
|
||||
--
|
||||
2.20.1
|
||||
|
||||
26
install/ui/util/make-css.sh
Executable file
26
install/ui/util/make-css.sh
Executable file
@@ -0,0 +1,26 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Authors:
|
||||
# Petr Vobornik <pvoborni@redhat.com>
|
||||
#
|
||||
# Copyright (C) 2013 Red Hat
|
||||
# see file 'COPYING' for use and warranty information
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
set -o errexit
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
py3-lesscpy -x $DIR/../less/ipa.less > $DIR/../css/ipa.css
|
||||
exit $?
|
||||
@@ -1,29 +0,0 @@
|
||||
#!/bin/bash -eu
|
||||
|
||||
if [ $# -ne 1 ]; then
|
||||
echo 'The script requires exactly one argument (a jQuery version):'
|
||||
echo
|
||||
echo ' $ ./make-jquery.sh 3.4.1'
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
WD=$(realpath $(dirname "${BASH_SOURCE[0]}"))
|
||||
JQUERY_VERSION=$1
|
||||
|
||||
# Clone jQuery and apply patches
|
||||
JQUERY_CLONE=$(mktemp -d)
|
||||
git clone -b ${JQUERY_VERSION} --depth 1 https://github.com/jquery/jquery.git $JQUERY_CLONE
|
||||
pushd $JQUERY_CLONE
|
||||
git am ${WD}/jquery-patches/${JQUERY_VERSION}/*
|
||||
|
||||
# Build jQuery
|
||||
npm install
|
||||
npm run-script build
|
||||
|
||||
# Replace the project version of jQuery with the built one
|
||||
cp -fv dist/jquery.min.js ${WD}/../src/libs/jquery.js
|
||||
|
||||
# Clean up
|
||||
popd
|
||||
rm -rf $JQUERY_CLONE
|
||||
@@ -59,7 +59,7 @@ OPTIONS
|
||||
|
||||
--all Do --clone --checkout --patches --links --dojo --util
|
||||
|
||||
--branch <br> Specify a Dojo branch/tag/hash to checkout, default: 1.16.2
|
||||
--branch <br> Specify a Dojo branch/tag/hash to checkout, default: 1.8.3
|
||||
|
||||
--dir <dir> Specify a clone dir, default: freeipa/../dojo/
|
||||
__EOF__
|
||||
@@ -76,7 +76,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DOJO_DIR=$DIR/../../../../dojo
|
||||
|
||||
# working version of Dojo toolkit
|
||||
BRANCH='1.16.2'
|
||||
BRANCH='1.13.0'
|
||||
YES='YES'
|
||||
|
||||
args=`getopt -q -u -l help,checkout,clone,patches,links,dojo,util,all,branch:,dir: a $*`
|
||||
@@ -166,6 +166,7 @@ if [[ $DOJO = $YES ]] ; then
|
||||
git checkout master
|
||||
git fetch --tags
|
||||
git fetch
|
||||
git branch -D $BRANCH
|
||||
git checkout $BRANCH
|
||||
fi
|
||||
popd
|
||||
@@ -186,6 +187,7 @@ if [[ $UTIL = $YES ]] ; then
|
||||
git checkout master
|
||||
git fetch --tags
|
||||
git fetch
|
||||
git branch -D $BRANCH
|
||||
git checkout $BRANCH
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user