Skip to content

Commit 00013d6

Browse files
committed
YARN-8633. Update DataTables version in yarn-common in line with JQuery 3 upgrade. Contributed by Akhil PB.
1 parent da9a39e commit 00013d6

File tree

19 files changed

+171
-168
lines changed

19 files changed

+171
-168
lines changed

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ For:
553553
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
554554
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
555555
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
556-
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/
556+
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/
557557
--------------------------------------------------------------------------------
558558
Copyright (C) 2008-2016, SpryMedia Ltd.
559559

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@
237237
<exclude>src/main/resources/webapps/test/.keep</exclude>
238238
<exclude>src/main/resources/webapps/proxy/.keep</exclude>
239239
<exclude>src/main/resources/webapps/node/.keep</exclude>
240-
<exclude>src/main/resources/webapps/static/dt-1.9.4/css/jui-dt.css</exclude>
241-
<exclude>src/main/resources/webapps/static/dt-1.9.4/css/demo_table.css</exclude>
242-
<exclude>src/main/resources/webapps/static/dt-1.9.4/images/Sorting icons.psd</exclude>
243-
<exclude>src/main/resources/webapps/static/dt-1.9.4/js/jquery.dataTables.min.js</exclude>
240+
<exclude>src/main/resources/webapps/static/dt-1.10.7/css/jui-dt.css</exclude>
241+
<exclude>src/main/resources/webapps/static/dt-1.10.7/css/demo_table.css</exclude>
242+
<exclude>src/main/resources/webapps/static/dt-1.10.7/images/Sorting icons.psd</exclude>
243+
<exclude>src/main/resources/webapps/static/dt-1.10.7/js/jquery.dataTables.min.js</exclude>
244244
<exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
245245
<exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js</exclude>
246246
<exclude>src/main/resources/webapps/static/jquery/jquery-3.3.1.min.js</exclude>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public class JQueryUI extends HtmlBlock {
6666
@Override
6767
protected void render(Block html) {
6868
html.link(root_url("static/jquery/themes-1.9.1/base/jquery-ui.css"))
69-
.link(root_url("static/dt-1.9.4/css/jui-dt.css"))
69+
.link(root_url("static/dt-1.10.7/css/jui-dt.css"))
7070
.script(root_url("static/jquery/jquery-3.3.1.min.js"))
7171
.script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
72-
.script(root_url("static/dt-1.9.4/js/jquery.dataTables.min.js"))
72+
.script(root_url("static/dt-1.10.7/js/jquery.dataTables.min.js"))
7373
.script(root_url("static/yarn.dt.plugins.js"))
7474
.script(root_url("static/dt-sorting/natural.js"))
7575
.style("#jsnotice { padding: 0.2em; text-align: center; }",

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/css/demo_table.css hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/css/demo_table.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ table.display {
110110
margin: 0 auto;
111111
clear: both;
112112
width: 100%;
113-
113+
114114
/* Note Firefox 3.5 and before have a bug with border-collapse
115-
* ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
115+
* ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
116116
* border-spacing: 0; is one possible option. Conditional-css.com is
117117
* useful for this kind of thing
118118
*
119119
* Further note IE 6/7 has problems when calculating widths with border width.
120120
* It subtracts one px relative to the other browsers from the first column, and
121121
* adds one to the end...
122122
*
123-
* If you want that effect I'd suggest setting a border-top/left on th/td's and
123+
* If you want that effect I'd suggest setting a border-top/left on th/td's and
124124
* then filling in the gaps with other borders.
125125
*/
126126
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/css/jui-dt.css hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/css/jui-dt.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ tr.even { background: rgba(0, 0, 255, 0.05); }
312312
* Sorting classes for columns
313313
*/
314314
tr.odd td.sorting_1 { background: rgba(0, 0, 0, 0.03); }
315-
tr.odd td.sorting_2 { background: rgba(0, 0, 0, 0.02); }
315+
tr.odd td.sorting_2 { background: rgba(0, 0, 0, 0.02); }
316316
tr.odd td.sorting_3 { background: rgba(0, 0, 0, 0.02); }
317317
tr.even td.sorting_1 { background: rgba(0, 0, 0, 0.08); }
318318
tr.even td.sorting_2 { background: rgba(0, 0, 0, 0.06); }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/js/jquery.dataTables.min.js

+160
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/js/jquery.dataTables.min.js

-157
This file was deleted.

0 commit comments

Comments
 (0)