Skip to content

Commit

Permalink
managed jquery-ui by bower (#1558)
Browse files Browse the repository at this point in the history
  • Loading branch information
linxuhua authored and almasaeed2010 committed Jul 1, 2017
1 parent e47823e commit 9ccb1f6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"bootstrap-timepicker": "^0.5.2",
"jquery-sparkline": "^2.1.3",
"font-awesome": "^4.7.0",
"Ionicons": "ionicons#^2.0.1"
"Ionicons": "ionicons#^2.0.1",
"jquery-ui": "1.11.4"
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
<!-- jQuery 3 -->
<script src="bower_components/jquery/dist/jquery.min.js"></script>
<!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.min.js"></script>
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
<script>
$.widget.bridge('uibutton', $.ui.button);
Expand Down
2 changes: 1 addition & 1 deletion pages/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
<!-- Bootstrap 3.3.7 -->
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
<script src="../bower_components/jquery-ui/jquery-ui.min.js"></script>
<!-- Slimscroll -->
<script src="../bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
<!-- FastClick -->
Expand Down

0 comments on commit 9ccb1f6

Please sign in to comment.