Skip to content

Commit afdb24c

Browse files
committed
HBASE-27802 Manage static javascript resources programatically (addendum: Fix not working popovers on UI)
Popovers were not working on the UI and the following JS error was logged to browser console: ``` Uncaught TypeError: i.createPopper is not a function ``` This is because popper.js was not available on the page for Bootstrap. Solution: We use bootstrap.bundle.min.js instead which includes both popper.js and Bootstrap.
1 parent dfd0bab commit afdb24c

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
--%>
2020

2121
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
22-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
22+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2323
<script src="/static/js/tab.js" type="text/javascript"></script>
2424
<script type="text/javascript">
2525
$(document).ready(function() {

hbase-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@
784784
<version>${bootstrap.version}</version>
785785
<type>jar</type>
786786
<overWrite>true</overWrite>
787-
<includes>**/js/bootstrap.min.js</includes>
787+
<includes>**/js/bootstrap.bundle.min.js</includes>
788788
<fileMappers>
789789
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
790790
</fileMappers>

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
441441
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
442442
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
443443
<script src="/static/js/parser-date-iso8601.min.js" type="text/javascript"></script>
444-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
444+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
445445
<script src="/static/js/tab.js" type="text/javascript"></script>
446446
<script src="/static/js/jqSpager.js" type="text/javascript"></script>
447447
<script>

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
256256
</div>
257257
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
258258
<script src="/static/js/jquery.tablesorter.min.js" type="text/javascript"></script>
259-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
259+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
260260
<script src="/static/js/tab.js" type="text/javascript"></script>
261261
<script>
262262
$(document).ready(function()

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ org.apache.hadoop.hbase.util.JvmVersion;
136136
</div> <!-- /container -->
137137

138138
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
139-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
139+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
140140
<script src="/static/js/tab.js" type="text/javascript"></script>
141141
</body>
142142
</html>

hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
--%>
2020
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
21-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
21+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2222
<script src="/static/js/tab.js" type="text/javascript"></script>
2323
<script type="text/javascript">
2424
$(document).ready(function() {

hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
--%>
2020
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
21-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
21+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2222
<script src="/static/js/tab.js" type="text/javascript"></script>
2323
<script type="text/javascript">
2424
$(document).ready(function() {

hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
--%>
2020
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
21-
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
21+
<script src="/static/js/bootstrap.bundle.min.js" type="text/javascript"></script>
2222
<script src="/static/js/tab.js" type="text/javascript"></script>
2323
<script type="text/javascript">
2424
$(document).ready(function() {

0 commit comments

Comments
 (0)