Merge branch 'QA_4_4'

1 files changed, 9 insertions, 6 deletions

diff --git a/js/pmd/designer_page.js b/js/pmd/designer_page.js
index 68684f3cf2..36bb2d0857 100644
--- a/js/pmd/designer_page.js
+++ b/js/pmd/designer_page.js
@@ -104,7 +104,7 @@ function Show_new_page_tables(check)
         }
     }
     selected_page = -1;
-    $("#top_menu #page_name").text(PMA_messages.strUntitled);
+    $("#name-panel #page_name").text(PMA_messages.strUntitled);
     MarkUnsaved();
 }
 
@@ -112,7 +112,7 @@ function Load_HTML_for_page(page_id)
 {
     Show_new_page_tables(false);
     Load_page_objects(page_id, function (page, tbl_cords) {
-        $("#top_menu #page_name").text(page.page_descr);
+        $("#name-panel #page_name").text(page.page_descr);
         MarkSaved();
         for (var t = 0; t < tbl_cords.length; t++) {
             var tb_id = db + '.' + tbl_cords[t].table_name;
@@ -132,14 +132,17 @@ function Load_page_objects(page_id, callback)
 {
     DesignerOfflineDB.loadObject('pdf_pages', page_id, function (page) {
         var tbl_cords = [];
-        for (var i = 0; i < page.tbl_cords.length; i++) {
+        var count = page.tbl_cords.length;
+        for (var i = 0; i < count; i++) {
             DesignerOfflineDB.loadObject('table_coords', page.tbl_cords[i], function (tbl_cord) {
                 tbl_cords.push(tbl_cord);
+                if (tbl_cords.length == count) {
+                    if (typeof callback !== 'undefined') {
+                        callback(page, tbl_cords);
+                    }
+                }
             });
         }
-        if (typeof callback !== 'undefined') {
-            callback(page, tbl_cords);
-        }
     });
 }