svn: /web/doc-editor/trunk/js/ main.js ui/component/ErrorFileGrid.js ui/component/LocalMailGrid.js ui/component/NotInENGrid.js ui/component/PendingCommitGrid.js ui/component/PendingPatchGrid.js ui/component/PendingReviewGrid.js ui/component/PendingTranslateGrid.js ui/component/StaleFileGrid.js ui/component/SummaryGrid.js ui/task/VCSCommitTask.js
[email protected] (Yannick Torres)
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <[email protected]> |
yannick Wed, 02 Dec 2009 22:44:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291619
Log:
Load (or reload) all stores one after the others. Fix bug #50342
Bug: http://bugs.php.net/50342 (Open) Load Ext Js store synchronous
Changed paths:
U web/doc-editor/trunk/js/main.js
U web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js
U web/doc-editor/trunk/js/ui/component/LocalMailGrid.js
U web/doc-editor/trunk/js/ui/component/NotInENGrid.js
U web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js
U web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js
U web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js
U web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js
U web/doc-editor/trunk/js/ui/component/StaleFileGrid.js
U web/doc-editor/trunk/js/ui/component/SummaryGrid.js
U web/doc-editor/trunk/js/ui/task/VCSCommitTask.js
svn-diffs-291619.txt
(text/x-diff, 16.2 KB)
Modified: web/doc-editor/trunk/js/main.js
===================================================================
--- web/doc-editor/trunk/js/main.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/main.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -57,6 +57,133 @@
);
},
+ loadAllStore: function() {
+
+ // Store to load for LANG project
+ if (phpDoc.userLang !== 'en') {
+ // We load all stores, one after the others
+ document.getElementById("loading-msg").innerHTML = "Loading data 1/8...";
+ ui.component.PendingTranslateGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 2/8...";
+ ui.component.StaleFileGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 3/8...";
+ ui.component.ErrorFileGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 4/8...";
+ ui.component.PendingReviewGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 5/8...";
+ ui.component.NotInENGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 6/8...";
+ ui.component.PendingCommitGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 7/8...";
+ ui.component.PendingPatchGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 8/8...";
+ ui.component.SummaryGrid.getInstance().store.load({
+ callback: function() {
+ // Now, we can to remove the global mask
+ Ext.get('loading').remove();
+ Ext.fly('loading-mask').fadeOut({ remove : true });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ } else {
+ // Store to load only for EN project
+ document.getElementById("loading-msg").innerHTML = "Loading data 1/3...";
+ ui.component.PendingCommitGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 2/3...";
+ ui.component.PendingPatchGrid.getInstance().store.load({
+ callback: function() {
+ document.getElementById("loading-msg").innerHTML = "Loading data 3/3...";
+ ui.component.LocalMailGrid.getInstance().store.load({
+ callback: function() {
+ // Now, we can to remove the global mask
+ Ext.get('loading').remove();
+ Ext.fly('loading-mask').fadeOut({ remove : true });
+ }
+ });
+ }
+ });
+ }
+ });
+
+ }
+
+ },
+
+ reloadAllStore: function() {
+
+ // Store to reload for LANG project
+ if (phpDoc.userLang !== 'en') {
+ // We reload all stores, one after the others
+ ui.component.PendingTranslateGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.StaleFileGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.ErrorFileGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.PendingReviewGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.NotInENGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.PendingCommitGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.PendingPatchGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.SummaryGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.TranslatorGrid.getInstance().store.reload();
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ } else {
+ // Store to reload only for EN project
+ ui.component.PendingCommitGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.PendingPatchGrid.getInstance().store.reload({
+ callback: function() {
+ ui.component.LocalMailGrid.getInstance().store.reload();
+ }
+ });
+ }
+ });
+
+ }
+
+ },
+
// Need confirm if we want to close a tab and the content have been modified.
removeTabEvent : function(tabpanel, tab)
{
@@ -314,11 +441,9 @@
}]
}]
});
+ // Load all store & remove the mask after all store are loaded
+ this.loadAllStore();
- // Remove the global loading message
- Ext.get('loading').remove();
- Ext.fly('loading-mask').fadeOut({ remove : true });
-
// Direct access to a file as anonymous user
if (directAccess) {
ui.component.RepositoryTree.getInstance().openFile(
Modified: web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -357,7 +357,6 @@
Ext.apply(this,
{
store : new ui.component._ErrorFileGrid.store({
- autoLoad : (phpDoc.userLang !== 'en'),
proxy : new Ext.data.HttpProxy({
url : './do/getFilesError'
})
@@ -422,4 +421,4 @@
ui.component._ErrorFileGrid.instance = new ui.component.ErrorFileGrid(config);
}
return ui.component._ErrorFileGrid.instance;
-};
\ No newline at end of file
+};
Modified: web/doc-editor/trunk/js/ui/component/LocalMailGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/LocalMailGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/LocalMailGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -73,10 +73,6 @@
sm : new Ext.grid.RowSelectionModel({ singleSelect: true }),
listeners : {
- render : function(grid)
- {
- grid.store.load.defer(20, grid.store);
- },
rowcontextmenu : function(grid, rowIndex, e)
{
grid.getSelectionModel().selectRow(rowIndex);
@@ -157,4 +153,4 @@
ui.component._LocalMailGrid.instance = new ui.component.LocalMailGrid(config);
}
return ui.component._LocalMailGrid.instance;
-};
\ No newline at end of file
+};
Modified: web/doc-editor/trunk/js/ui/component/NotInENGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/NotInENGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/NotInENGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -200,7 +200,6 @@
Ext.apply(this,
{
store : new ui.component._NotInENGrid.store({
- autoLoad : (phpDoc.userLang === 'en') ? false : true,
proxy : new Ext.data.HttpProxy({
url : './do/getFilesNotInEn'
})
@@ -221,4 +220,4 @@
ui.component._NotInENGrid.instance = new ui.component.NotInENGrid(config);
}
return ui.component._NotInENGrid.instance;
-};
\ No newline at end of file
+};
Modified: web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -491,7 +491,6 @@
Ext.apply(this,
{
store : new ui.component._PendingCommitGrid.store({
- autoLoad : true,
proxy : new Ext.data.HttpProxy({
url : './do/getFilesPendingCommit'
})
Modified: web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -290,7 +290,6 @@
Ext.apply(this,
{
store : new ui.component._PendingPatchGrid.store({
- autoLoad : true,
proxy : new Ext.data.HttpProxy({
url : './do/getFilesPendingPatch'
})
Modified: web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -379,7 +379,6 @@
Ext.apply(this,
{
store : new ui.component._PendingReviewGrid.store({
- autoLoad : (phpDoc.userLang !== 'en'),
proxy : new Ext.data.HttpProxy({
url : './do/getFilesNeedReviewed'
})
Modified: web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -182,7 +182,6 @@
{
columns : ui.component._PendingTranslateGrid.columns,
store : new ui.component._PendingTranslateGrid.store({
- autoLoad : (phpDoc.userLang !== 'en'),
proxy : new Ext.data.HttpProxy({
url : './do/getFilesNeedTranslate'
})
Modified: web/doc-editor/trunk/js/ui/component/StaleFileGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/StaleFileGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/StaleFileGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -364,7 +364,6 @@
{
columns : ui.component._StaleFileGrid.columns,
store : new ui.component._StaleFileGrid.store({
- autoLoad : (phpDoc.userLang !== 'en'),
proxy : new Ext.data.HttpProxy({
url : './do/getFilesNeedUpdate'
})
@@ -426,4 +425,4 @@
ui.component._StaleFileGrid.instance = new ui.component.StaleFileGrid(config);
}
return ui.component._StaleFileGrid.instance;
-};
\ No newline at end of file
+};
Modified: web/doc-editor/trunk/js/ui/component/SummaryGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/SummaryGrid.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/component/SummaryGrid.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -116,10 +116,6 @@
view : ui.component._SummaryGrid.view,
listeners : {
- render : function(grid)
- {
- grid.store.load.defer(20, grid.store);
- },
rowdblclick : function ( grid, rowIndex, e )
{
var id = grid.store.getAt(rowIndex).data.id;
Modified: web/doc-editor/trunk/js/ui/task/VCSCommitTask.js
===================================================================
--- web/doc-editor/trunk/js/ui/task/VCSCommitTask.js 2009-12-02 22:40:00 UTC (rev 291618)
+++ web/doc-editor/trunk/js/ui/task/VCSCommitTask.js 2009-12-02 22:44:32 UTC (rev 291619)
@@ -68,20 +68,8 @@
}]
}).show();
- // Apply modification
- if (phpDoc.userLang != 'en') {
- // Component
- ui.component.PendingTranslateGrid.getInstance().store.reload();
- ui.component.StaleFileGrid.getInstance().store.reload();
- ui.component.ErrorFileGrid.getInstance().store.reload();
- ui.component.PendingReviewGrid.getInstance().store.reload();
- ui.component.NotInENGrid.getInstance().store.reload();
- }
- // Component
- ui.component.PendingCommitGrid.getInstance().store.reload();
- // Stats
- ui.component.TranslatorGrid.getInstance().store.reload();
- ui.component.SummaryGrid.getInstance().store.reload();
+ // Reload all store
+ phpDoc.reloadAllStore();
}