Anonymous avatar Anonymous committed 92b74df

Apply patch from changeset 522004b1d118 to fix js break dashboard layout

Comments (0)

Files changed (3)

admin_tools/dashboard/static/admin_tools/js/jquery/jquery.dashboard.js

         var start = 0;
         var stop = 0;
         var last_stop = 0;
-        if (options.columns != sizes.length) {
-            // don't break layout if columns count changed
+        // don't break layout if columns count or elts count changed
+        var elts_count = 0;
+        for (var i in sizes) {
+            elts_count += sizes[i];
+        }
+        if (options.columns != sizes.length || elts_count != elts.length) {
+            // reset sizes so we don't break
             sizes = [];
         }
         for (var i = 0; i < options.columns; i++) {

admin_tools/media/admin_tools/js/dashboard.js

 var init_dashboard = function(id, columns, preferences, url) {
-    $('#'+id).dashboard({
+    jQuery('#'+id).dashboard({
         'columns': columns,
         'load_preferences_function': function(options) {
             return preferences;
             jQuery.post(url, { data: JSON.stringify(preferences) });
         }
     });
-    $(".group-tabs").tabs();
-    $(".group-accordion").accordion({header: '.group-accordion-header'});
+    jQuery(".group-tabs").tabs();
+    jQuery(".group-accordion").accordion({header: '.group-accordion-header'});
 };

admin_tools/media/admin_tools/js/jquery/jquery.dashboard.js

         var start = 0;
         var stop = 0;
         var last_stop = 0;
-        if (options.columns != sizes.length) {
-            // don't break layout if columns count changed
+        // don't break layout if columns count or elts count changed
+        var elts_count = 0;
+        for (var i in sizes) {
+            elts_count += sizes[i];
+        }
+        if (options.columns != sizes.length || elts_count != elts.length) {
+            // reset sizes so we don't break
             sizes = [];
         }
         for (var i = 0; i < options.columns; i++) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.