Changeset 6580

Timestamp:

Oct 28, 2014, 7:50:27 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1874: Please wait. The annotations are loading...

Use location.replace() to load the new page instead of location.href.

Location:

branches/3.3-stable/www/common

Files:

• annotations/list.js (modified) (1 diff)
• history/history.js (modified) (1 diff)
• overview/overview.js (modified) (3 diffs)

branches/3.3-stable/www/common/annotations/list.js

@@ -47 +47 @@
     url += '&item_type='+Data.get('annotate-data', 'item-type');
     url += '&item_id='+Data.get('annotate-data', 'item-id');
-    frames['annotations'].location.href = url;
+    frames['annotations'].location.replace(url);
     loaded = true;
   }

branches/3.3-stable/www/common/history/history.js

@@ -60 +60 @@
     url += '&source_type='+Data.get('history-data', 'source-type');
     url += '&source_id='+Data.get('history-data', 'source-id');
-    frames['history-frame'].location.href = url;
+    frames['history-frame'].location.replace(url);
     loaded = true;
   }

branches/3.3-stable/www/common/overview/overview.js

@@ -41 +41 @@
     url += '&item_type='+Data.get('overview-data', 'item-type');
     url += '&item_id='+Data.get('overview-data', 'item-id');
-    frames['overview'].location.href = url;
+    frames['overview'].location.replace(url);
     loaded = true;
   }
@@ -51 +51 @@
     url += '&item_type='+Data.get('overview-data', 'item-type');
     url += '&item_id='+Data.get('overview-data', 'item-id');
-    frames['overview'].location.href = url;
+    frames['overview'].location.replace(url);
   }
   
@@ -60 +60 @@
     url += '&item_type='+Data.get('overview-data', 'item-type');
     url += '&item_id='+Data.get('overview-data', 'item-id');
-    frames['overview'].location.href = url;
+    frames['overview'].location.replace(url);
   }