Эх сурвалжийг харах

[search] Bump jQuery and jQuery UI versions

Enrico Berti 11 жил өмнө
parent
commit
19fb05a

+ 1 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -685,7 +685,7 @@ ${layout.menubar(section='query')}
   </div>
 </div>
 
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -443,7 +443,7 @@ ${ layout.menubar(section='workflows') }
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/datatables-paging-0.1.js" type="text/javascript" charset="utf-8"></script>
 

+ 1 - 1
apps/search/src/search/templates/admin_collection_facets.mako

@@ -530,7 +530,7 @@ ${ commonheader(_('Search'), "search", user, "29px") | n,unicode }
 <script src="/static/ext/js/bootstrap-editable.min.js"></script>
 <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/search/static/js/knockout-sortable.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js"></script>
 
 <script type="text/javascript">
   var MOMENT_DATE_FORMAT = "MM-DD-YYYY";

+ 1 - 1
apps/search/src/search/templates/admin_collection_highlighting.mako

@@ -88,7 +88,7 @@ ${ commonheader(_('Search'), "search", user, "29px") | n,unicode }
 </style>
 
 
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js"></script>
 ## Duplication with desktop/core required because of packaging for now
 <script src="/search/static/js/jquery.selector.js"></script>
 

+ 1 - 1
apps/search/src/search/templates/admin_collection_sorting.mako

@@ -120,7 +120,7 @@ ${ commonheader(_('Search'), "search", user, "29px") | n,unicode }
 </style>
 
 <script src="/search/static/js/knockout-sortable.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js"></script>
 
 <script type="text/javascript">
 

+ 1 - 1
apps/search/src/search/templates/dashboard.mako

@@ -293,7 +293,7 @@ ${ commonheader(_('Search'), "search", user, "70px") | n,unicode }
 
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/search/static/js/knockout-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 
 <link href="/static/ext/css/leaflet.css" rel="stylesheet">

+ 14 - 4
apps/search/src/search/templates/search2.mako

@@ -125,8 +125,8 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
     </div>
     <div data-bind="css: { 'draggable-widget': true, 'disabled': !availableDraggableChart() },
                     draggable: {data: draggablePie(), isEnabled: availableDraggableChart, 
-                    options: {'start': function(event, ui){$('.card-body').slideUp('fast');}, 
-                              'stop': function(event, ui){$('.card-body').slideDown('fast');}}}" 
+                    options: {'zIndex': 2500, 'start': function(event, ui){$('.card-body').slideUp('fast');},
+                              'stop': function(event, ui){$('.card-body').slideDown('fast');}}}"
          title="${_('Pie Chart')}" rel="tooltip" data-placement="top">
          <a data-bind="attr: {href: $root.availableDraggableChart()}, 
                        style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
@@ -255,7 +255,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
 </script>
 
 <script type="text/html" id="widget-template">
-  <div data-bind="css: klass">
+  <div data-bind="attr: {'id': 'wdg_'+ id(),}, css: klass">
     <h2 class="card-heading simple">
       <span data-bind="visible: $root.isEditing">
         <a href="javascript:void(0)" class="move-widget"><i class="fa fa-arrows"></i></a>
@@ -762,7 +762,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
 <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/codemirror-xml.js"></script>
 <script src="/static/ext/js/mustache.js"></script>
-<script src="/static/ext/js/jquery/plugins/jquery-ui-draggable-droppable-sortable-1.8.23.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/search/static/js/knockout-sortable.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/jquery/plugins/jquery.flot.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/jquery/plugins/jquery.flot.categories.min.js" type="text/javascript" charset="utf-8"></script>
@@ -1025,6 +1025,11 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
     cursor: pointer;
   }
 
+  body.modal-open {
+      overflow: auto!important;
+  }
+
+
 </style>
 
 <script type="text/javascript" charset="utf-8">
@@ -1316,6 +1321,11 @@ $(document).ready(function () {
       });
       selectedWidget = widget;
       $("#addFacetDemiModal").modal("show");
+      $("#addFacetDemiModal").on("shown", function(){
+        window.setTimeout(function(){
+          $(window).scrollTop($("#wdg_" + selectedWidget.id()).position().top);
+        }, 500);
+      });
       $("#addFacetDemiModal input[type='text']").focus();
     }
   }

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -137,7 +137,7 @@ from django.utils.translation import ugettext as _
   </script>
 
   <script src="/static/js/hue.utils.js"></script>
-  <script src="/static/ext/js/jquery/jquery-2.0.2.min.js"></script>
+  <script src="/static/ext/js/jquery/jquery-2.1.1.min.js"></script>
   <script src="/static/js/jquery.migration.js"></script>
   <script src="/static/js/jquery.filechooser.js"></script>
   <script src="/static/js/jquery.selector.js"></script>

+ 1 - 1
desktop/core/src/desktop/templates/common_jasmine.mako

@@ -23,7 +23,7 @@
     <link rel="stylesheet" type="text/css" href="/static/ext/css/jasmine.css">
     <script type="text/javascript" src="/static/ext/js/jasmine/jasmine-1.2.0.js"></script>
     <script type="text/javascript" src="/static/ext/js/jasmine/jasmine-html-1.2.0.js"></script>
-    <script type="text/javascript" src="/static/ext/js/jquery/jquery-2.0.2.min.js"></script>
+    <script type="text/javascript" src="/static/ext/js/jquery/jquery-2.1.1.min.js"></script>
     <script type="text/javascript" src="/static/js/jquery.migration.js"></script>
     <script type="text/javascript" src="/static/ext/js/jasmine/jasmine-jquery-1.3.1.js"></script>
     <script type="text/javascript" src="/static/ext/js/knockout-min.js"></script>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 1 - 0
desktop/core/static/ext/js/jquery/jquery-2.1.1.min.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 5 - 0
desktop/core/static/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js


+ 1 - 1
desktop/libs/liboauth/src/liboauth/templates/oauth-login.mako

@@ -202,7 +202,7 @@ from django.utils.translation import ugettext as _
   </div>
 </div>
 
-<script src="/static/ext/js/jquery/jquery-2.0.2.min.js"></script>
+<script src="/static/ext/js/jquery/jquery-2.1.1.min.js"></script>
 <script>
   var $buttonsGroup = $("#buttons_group");
   if($buttonsGroup.children().length > 2) {

+ 1 - 1
desktop/libs/libopenid/src/libopenid/templates/openid-login.html

@@ -147,7 +147,7 @@
   </div>
 </div>
 
-<script src="/static/ext/js/jquery/jquery-2.0.2.min.js"></script>
+<script src="/static/ext/js/jquery/jquery-2.1.1.min.js"></script>
 <script>
   $(document).ready(function () {
     var _skew = -1;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно