Merge pull request #457 from suvjunmd/jqueryui

Updated jQuery UI to 1.11.4
pull/454/merge
Abdullah Almsaeed 2015-05-27 14:05:12 +03:00
commit a0b752343d
2 changed files with 4 additions and 4 deletions

View File

@ -1068,8 +1068,8 @@
<!-- jQuery 2.1.4 --> <!-- jQuery 2.1.4 -->
<script src="plugins/jQuery/jQuery-2.1.4.min.js"></script> <script src="plugins/jQuery/jQuery-2.1.4.min.js"></script>
<!-- jQuery UI 1.11.2 --> <!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.2/jquery-ui.min.js" type="text/javascript"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip --> <!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
<script> <script>
$.widget.bridge('uibutton', $.ui.button); $.widget.bridge('uibutton', $.ui.button);

View File

@ -703,8 +703,8 @@
<script src="../plugins/jQuery/jQuery-2.1.4.min.js"></script> <script src="../plugins/jQuery/jQuery-2.1.4.min.js"></script>
<!-- Bootstrap 3.3.2 JS --> <!-- Bootstrap 3.3.2 JS -->
<script src="../bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="../bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!-- jQuery UI 1.11.1 --> <!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.1/jquery-ui.min.js" type="text/javascript"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
<!-- Slimscroll --> <!-- Slimscroll -->
<script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script> <script src="../plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<!-- FastClick --> <!-- FastClick -->