svn: /web/doc-editor/trunk/js/ main.js main_override.js ui/component/BugsGrid.js ui/component/EditorConf.js ui/component/EmailPrompt.js ui/component/ErrorFileGrid.js ui/component/FilePanel.js ui/component/LocalMailGrid.js ui/component/MainMenu.js ui/component/NotInENGrid.js ui/component/PendingCommitGrid.js ui/component/PendingPatchGrid.js ui/component/PendingReviewGrid.js ui/component/PendingTranslateGrid.js ui/component/RepositoryTree.js ui/component/StaleFileGrid.js ui/component/TranslatorGri
[email protected] (Yannick Torres)
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <[email protected]> |
yannick Sat, 19 Dec 2009 09:46:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292320
Log:
Migration ExtJs 3.0
Changed paths:
U web/doc-editor/trunk/js/main.js
U web/doc-editor/trunk/js/main_override.js
U web/doc-editor/trunk/js/ui/component/BugsGrid.js
U web/doc-editor/trunk/js/ui/component/EditorConf.js
U web/doc-editor/trunk/js/ui/component/EmailPrompt.js
U web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js
U web/doc-editor/trunk/js/ui/component/FilePanel.js
U web/doc-editor/trunk/js/ui/component/LocalMailGrid.js
U web/doc-editor/trunk/js/ui/component/MainMenu.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/RepositoryTree.js
U web/doc-editor/trunk/js/ui/component/StaleFileGrid.js
U web/doc-editor/trunk/js/ui/component/TranslatorGrid.js
U web/doc-editor/trunk/js/ui/component/ViewVCDiff.js
U web/doc-editor/trunk/js/ui/task/VCSCommitTask.js
svn-diffs-292320.txt
(text/x-diff, 33.4 KB)
Modified: web/doc-editor/trunk/js/main.js
===================================================================
--- web/doc-editor/trunk/js/main.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/main.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -262,120 +262,92 @@
}, {
// accordion
region : 'west',
+ layout : 'accordion',
+
collapsible : true,
collapseMode : 'mini',
animate : true,
split : true,
- layout : 'fit',
+
width : 300,
- autoScroll : true,
+ //autoHeight : true,
+ //autoScroll : true,
+
+ header : false,
+ tbar : [{
+ text : _('Main Menu'),
+ iconCls : 'MainMenu',
+ menu : mainMenu
+ }],
items : [{
- layout : 'accordion',
- animate : true,
- bodyBorder : false,
- border : false,
- tbar : [{
- text : _('Main Menu'),
- iconCls : 'MainMenu',
- menu : mainMenu
- }],
- items : [{
- id : 'acc-need-translate',
- title : _('Files Need Translate') + ' - <em id="acc-need-translate-nb">0</em>',
- layout : 'fit',
- iconCls : 'FilesNeedTranslate',
- hidden : (this.userLang === 'en'),
- items : [ ui.component.PendingTranslateGrid.getInstance() ],
- collapsed : true,
- listeners : {
- expand : function(panel)
- {
- //TODO: try to find a better way to handle this. If we don't do this, twinTrigger's field is not render because this panel is hidden at the load time
- Ext.getCmp('FNT-filter').wrap.setWidth(200);
- }
- }
- },{
- id : 'acc-need-update',
- title : _('Files Need Update') + ' - <em id="acc-need-update-nb">0</em>',
- layout : 'fit',
- iconCls : 'FilesNeedUpdate',
- hidden : (this.userLang === 'en'),
- items : [ ui.component.StaleFileGrid.getInstance() ],
- collapsed : true,
- listeners : {
- expand : function(panel)
- {
- //TODO: try to find a better way to handle this. If we don't do this, twinTrigger's field is not render because this panel is hidden at the load time
- Ext.getCmp('FNU-filter').wrap.setWidth(200);
- }
- }
- }, {
- id : 'acc-error',
- title : _('Error in current translation') + ' - <em id="acc-error-nb">0</em>',
- layout : 'fit',
- iconCls : 'FilesError',
- hidden : (this.userLang === 'en'),
- items : [ ui.component.ErrorFileGrid.getInstance() ],
- collapsed : true,
- listeners : {
- expand : function(panel)
- {
- //TODO: try to find a better way to handle this. If we don't do this, twinTrigger's field is not render because this panel is hidden at the load time
- Ext.getCmp('FE-filter').wrap.setWidth(200);
- }
- }
- }, {
- id : 'acc-need-reviewed',
- title : _('Files Need Reviewed') + ' - <em id="acc-need-reviewed-nb">0</em>',
- layout : 'fit',
- iconCls : 'FilesNeedReviewed',
- hidden : (this.userLang === 'en'),
- items : [ ui.component.PendingReviewGrid.getInstance() ],
- collapsed : true,
- listeners : {
- expand : function(panel)
- {
- //TODO: try to find a better way to handle this. If we don't do this, twinTrigger's field is not render because this panel is hidden at the load time
- Ext.getCmp('FNR-filter').wrap.setWidth(200);
- }
- }
- }, {
- id : 'acc-notInEn',
- title : _('Not in EN tree') + ' - <em id="acc-notInEn-nb">0</em>',
- layout : 'fit',
- iconCls : 'NotInEn',
- hidden : (this.userLang === 'en'),
- items : [ ui.component.NotInENGrid.getInstance() ],
- collapsed : true
- }, {
- id : 'acc-all-files',
- title : _('All files'),
- layout : 'fit',
- iconCls : 'AllFiles',
- items : [ ui.component.RepositoryTree.getInstance() ],
- collapsed : true,
- listeners : {
- expand : function(panel)
- {
- //TODO: try to find a better way to handle this. If we don't do this, twinTrigger's field is not render because this panel is hidden at the load time
- Ext.getCmp('AF-search').wrap.setWidth(200);
- }
- }
- }, {
- id : 'acc-need-pendingCommit',
- title : _('Pending for commit') + ' - <em id="acc-pendingCommit-nb">0</em>',
- layout : 'fit',
- iconCls : 'PendingCommit',
- items : [ ui.component.PendingCommitGrid.getInstance() ],
- collapsed : true
- }, {
- id : 'acc-need-pendingPatch',
- title : _('Pending Patch') + ' - <em id="acc-pendingPatch-nb">0</em>',
- layout : 'fit',
- iconCls : 'PendingPatch',
- items : [ ui.component.PendingPatchGrid.getInstance() ],
- collapsed : true
- }]
+ id : 'acc-need-translate',
+ title : _('Files Need Translate') + ' - <em id="acc-need-translate-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'FilesNeedTranslate',
+ hidden : (this.userLang === 'en'),
+ items : [ ui.component.PendingTranslateGrid.getInstance() ],
+ collapsed : true
+ },{
+ id : 'acc-need-update',
+ title : _('Files Need Update') + ' - <em id="acc-need-update-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'FilesNeedUpdate',
+ hidden : (this.userLang === 'en'),
+ items : [ ui.component.StaleFileGrid.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-error',
+ title : _('Error in current translation') + ' - <em id="acc-error-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'FilesError',
+ hidden : (this.userLang === 'en'),
+ items : [ ui.component.ErrorFileGrid.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-need-reviewed',
+ title : _('Files Need Reviewed') + ' - <em id="acc-need-reviewed-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'FilesNeedReviewed',
+ hidden : (this.userLang === 'en'),
+ items : [ ui.component.PendingReviewGrid.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-notInEn',
+ title : _('Not in EN tree') + ' - <em id="acc-notInEn-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'NotInEn',
+ hidden : (this.userLang === 'en'),
+ items : [ ui.component.NotInENGrid.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-all-files',
+ title : _('All files'),
+ layout : 'fit',
+ border : false,
+ iconCls : 'AllFiles',
+ items : [ ui.component.RepositoryTree.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-need-pendingCommit',
+ title : _('Pending for commit') + ' - <em id="acc-pendingCommit-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'PendingCommit',
+ items : [ ui.component.PendingCommitGrid.getInstance() ],
+ collapsed : true
+ }, {
+ id : 'acc-need-pendingPatch',
+ title : _('Pending Patch') + ' - <em id="acc-pendingPatch-nb">0</em>',
+ layout : 'fit',
+ border : false,
+ iconCls : 'PendingPatch',
+ items : [ ui.component.PendingPatchGrid.getInstance() ],
+ collapsed : true
}]
}, {
// main panel
Modified: web/doc-editor/trunk/js/main_override.js
===================================================================
--- web/doc-editor/trunk/js/main_override.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/main_override.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -1,46 +1,10 @@
-Ext.ux.TabCloseMenu = function(){
- var tabs, menu, ctxItem;
- this.init = function(tp){
- tabs = tp;
- tabs.on('contextmenu', onContextMenu);
- }
-
- function onContextMenu(ts, item, e){
- if (!menu) { // create context menu on first right click
- menu = new Ext.menu.Menu([{
- id: tabs.id + '-close',
- text: _('Close Tab'),
- handler: function(){
- tabs.remove(ctxItem);
- }
- }, {
- id: tabs.id + '-close-others',
- iconCls: 'closeOthersTabs',
- text: _('Close Other Tabs'),
- handler: function(){
- tabs.items.each(function(item){
- if (item.closable && item != ctxItem) {
- tabs.remove(item);
- }
- });
- }
- }]);
- }
- ctxItem = item;
- var items = menu.items;
- items.get(tabs.id + '-close').setDisabled(!item.closable);
- var disableOthers = true;
- tabs.items.each(function(){
- if (this != item && this.closable) {
- disableOthers = false;
- return false;
- }
- });
- items.get(tabs.id + '-close-others').setDisabled(disableOthers);
- menu.showAt(e.getPoint());
- }
-};
+Ext.ux.IFrameComponent = Ext.extend(Ext.BoxComponent, {
+ onRender : function(ct, position){
+ this.el = ct.createChild({tag: 'iframe', id: 'iframe-'+ this.id, frameBorder: 0, src: this.url});
+ }
+});
+/*
//Current bug in Radio/Checkbox
// http://extjs.com/forum/showthread.php?t=44603
@@ -211,3 +175,4 @@
}
}
});
+*/
\ No newline at end of file
Modified: web/doc-editor/trunk/js/ui/component/BugsGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/BugsGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/BugsGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -102,27 +102,23 @@
BugsUrl = grid.store.getAt(rowIndex).data.link,
BugsTitle = grid.store.getAt(rowIndex).data.title;
- if (!Ext.getCmp('main-panel').findById('mifp_bugs_' + BugsId)) {
+ if (!Ext.getCmp('main-panel').findById('bugs-' + BugsId)) {
Ext.getCmp('main-panel').add({
- id : 'mifp_bugs_' + BugsId,
- xtype : 'iframepanel',
- title : _('Loading...'),
+ id : 'bugs-' + BugsId,
+ xtype : 'panel',
+ title : Ext.util.Format.substr(BugsTitle, 0, 20) + '...',
tabTip : BugsTitle,
iconCls : 'iconBugs',
- loadMask : true,
- defaultSrc : BugsUrl,
- listeners : {
- documentloaded : function(frame)
- {
- frame.ownerCt.setTitle(Ext.util.Format.substr(BugsTitle, 0, 20) + '...');
- }
- }
+ closable : true,
+ layout : 'fit',
+ items: [ new Ext.ux.IFrameComponent({ id: 'frame-bugs-' + BugsId, url: BugsUrl }) ]
+
});
- Ext.getCmp('main-panel').setActiveTab('mifp_bugs_' + BugsId);
+ Ext.getCmp('main-panel').setActiveTab('bugs-' + BugsId);
} else {
- Ext.getCmp('main-panel').setActiveTab('mifp_bugs_' + BugsId);
+ Ext.getCmp('main-panel').setActiveTab('bugs-' + BugsId);
}
}
},
Modified: web/doc-editor/trunk/js/ui/component/EditorConf.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/EditorConf.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/EditorConf.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -482,12 +482,12 @@
}, {
id : 'confCard',
region : 'center',
- layout : 'slide',
+ layout : 'card',
width : 375,
frame : true,
activeItem : 0,
- bbar : new Ext.StatusBar({
+ bbar : new Ext.ux.StatusBar({
defaultText : _('All changes take effect immediately'),
defaultIconCls : 'confStatusBar'
}),
Modified: web/doc-editor/trunk/js/ui/component/EmailPrompt.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/EmailPrompt.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/EmailPrompt.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -18,11 +18,10 @@
text : _('Send'),
handler : function()
{
- var values = this.ownerCt.findByType('form').shift()
- .getForm().getValues();
+ var win = this.ownerCt.ownerCt,
+ values = win.findByType('form').shift().getForm().getValues();
XHR({
- scope : this,
params : {
task : 'sendEmail',
to : values.to,
@@ -31,11 +30,12 @@
},
success : function(response)
{
- this.ownerCt.close();
- Ext.MessageBox.alert(
+ win.close();
+
+ Ext.Msg.alert(
_('Status'),
- String.format(_('Email sent to {0} with success!'),
- this.ownerCt.name)
+ String.format(_('Email sent to {0} with success!'), win.name),
+ Ext.emptyFn
);
}
});
@@ -45,7 +45,7 @@
text : _('Cancel'),
handler : function()
{
- this.ownerCt.close();
+ this.ownerCt.ownerCt.close();
}
}],
Modified: web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/ErrorFileGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -189,9 +189,8 @@
ui.component.ErrorFileGrid = Ext.extend(Ext.grid.GridPanel,
{
loadMask : true,
- bodyBorder : false,
+ border : false,
autoExpandColumn : 'name',
-
view : ui.component._ErrorFileGrid.view,
columns : ui.component._ErrorFileGrid.columns,
@@ -270,13 +269,9 @@
height : 150,
collapsible : true,
collapsed : true,
- items : {
- xtype : 'iframepanel',
- id : 'FE-error-type-' + FileID,
- loadMask : true,
- defaultSrc : './error?dir=' + FilePath +
+ autoScroll : true,
+ autoLoad : './error?dir=' + FilePath +
'&file=' + FileName
- }
}, {
region : 'west',
xtype : 'panel',
@@ -426,8 +421,8 @@
{
if (!ui.component._ErrorFileGrid.instance) {
if (!config) {
- config = {};
- }
+ config = {};
+ }
ui.component._ErrorFileGrid.instance = new ui.component.ErrorFileGrid(config);
}
return ui.component._ErrorFileGrid.instance;
Modified: web/doc-editor/trunk/js/ui/component/FilePanel.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/FilePanel.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/FilePanel.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -384,7 +384,7 @@
}
}] : [{
xtype : 'panel',
- height : 21,
+ height : 26,
baseCls : '',
bodyStyle : 'padding-top:5px;',
html : [
@@ -656,7 +656,7 @@
},
cmscroll : function(scrollY)
{
- if (this.syncScroll && phpDoc.userConf[this.syncScrollConf] === 'true') {
+ if( this.syncScroll && phpDoc.userConf[this.syncScrollConf] ) {
var opp_prefix;
switch (this.ftype) {
case 'EN': opp_prefix = this.prefix + '-LANG'; break;
Modified: web/doc-editor/trunk/js/ui/component/LocalMailGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/LocalMailGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/LocalMailGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -111,26 +111,19 @@
if (!Ext.getCmp('main-panel').findById('mifp_' + MailId)) {
Ext.getCmp('main-panel').add({
- xtype : 'iframepanel',
- id : 'mifp_' + MailId,
- title : _('Loading...'),
+ xtype : 'panel',
+ id : 'mail-' + MailId,
+ title : Ext.util.Format.substr(MailTitle, 0, 20) + '...',
tabTip : MailTitle,
iconCls : 'home-mailing-title',
- loadMask : true,
- defaultSrc : MailUrl,
- listeners : {
- documentloaded : function(frame)
- {
- frame.ownerCt.setTitle(
- Ext.util.Format.substr(MailTitle, 0, 20) + '...'
- );
- }
- }
+ closable : true,
+ layout : 'fit',
+ items: [ new Ext.ux.IFrameComponent({ id: 'frame-mail-' + MailId, url: MailUrl }) ]
});
- Ext.getCmp('main-panel').setActiveTab('mifp_' + MailId);
+ Ext.getCmp('main-panel').setActiveTab('mail-' + MailId);
} else {
- Ext.getCmp('main-panel').setActiveTab('mifp_' + MailId);
+ Ext.getCmp('main-panel').setActiveTab('mail-' + MailId);
}
}
},
Modified: web/doc-editor/trunk/js/ui/component/MainMenu.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/MainMenu.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/MainMenu.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -230,17 +230,12 @@
Ext.getCmp('main-panel').add({
id : 'tab-report-bug',
- xtype : 'iframepanel',
- title : _('Loading...'),
+ xtype : 'panel',
+ title : _('Report bugs'),
iconCls : 'iconBugs',
- loadMask : true,
- defaultSrc : 'http://bugs.php.net/',
- listeners : {
- documentloaded : function(frame)
- {
- frame.ownerCt.setTitle(_('Report bugs'));
- }
- }
+ closable : true,
+ layout : 'fit',
+ items: [ new Ext.ux.IFrameComponent({ id: 'frame-tab-report-bug', url: 'http://bugs.php.net/' }) ]
});
Ext.getCmp('main-panel').setActiveTab('tab-report-bug');
@@ -259,17 +254,12 @@
Ext.getCmp('main-panel').add({
id : 'tab-documentation',
- xtype : 'iframepanel',
- title : _('Loading...'),
+ xtype : 'panel',
+ title : _('Documentation'),
iconCls : 'iconBook',
- loadMask : true,
- defaultSrc : 'http://wiki.php.net/doc/editor/',
- listeners : {
- documentloaded : function(frame)
- {
- frame.ownerCt.setTitle(_('Documentation'));
- }
- }
+ closable : true,
+ layout : 'fit',
+ items: [ new Ext.ux.IFrameComponent({ id: 'frame-tab-documentation', url: 'http://wiki.php.net/doc/editor/' }) ]
});
Ext.getCmp('main-panel').setActiveTab('tab-documentation');
Modified: web/doc-editor/trunk/js/ui/component/NotInENGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/NotInENGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/NotInENGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -119,7 +119,7 @@
ui.component.NotInENGrid = Ext.extend(Ext.grid.GridPanel,
{
loadMask : true,
- bodyBorder : false,
+ border : false,
autoExpandColumn : 'name',
view : ui.component._NotInENGrid.view,
columns : ui.component._NotInENGrid.columns,
Modified: web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/PendingCommitGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -419,7 +419,7 @@
ui.component.PendingCommitGrid = Ext.extend(Ext.grid.GridPanel,
{
loadMask : true,
- bodyBorder : false,
+ border : false,
autoExpandColumn : 'name',
columns : ui.component._PendingCommitGrid.columns,
view : ui.component._PendingCommitGrid.view,
Modified: web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/PendingPatchGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -134,7 +134,7 @@
columns : ui.component._PendingPatchGrid.columns,
view : ui.component._PendingPatchGrid.view,
loadMask : true,
- bodyBorder : false,
+ border : false,
autoExpandColumn : 'name',
listeners : {
@@ -147,7 +147,7 @@
FileName = grid.store.getAt(rowIndex).data.name,
FileUniqID = grid.store.getAt(rowIndex).data.uniqID,
FileID = Ext.util.md5('PP-' + FileUniqID + FilePath + FileName),
- tmp;
+ tmp;
grid.getSelectionModel().selectRow(rowIndex);
@@ -308,8 +308,8 @@
{
if (!ui.component._PendingPatchGrid.instance) {
if (!config) {
- config = {};
- }
+ config = {};
+ }
ui.component._PendingPatchGrid.instance = new ui.component.PendingPatchGrid(config);
}
return ui.component._PendingPatchGrid.instance;
Modified: web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/PendingReviewGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -247,7 +247,7 @@
ui.component.PendingReviewGrid = Ext.extend(Ext.grid.GridPanel,
{
loadMask : true,
- bodyBorder : false,
+ border : false,
autoExpandColumn : 'name',
columns : ui.component._PendingReviewGrid.columns,
view : ui.component._PendingReviewGrid.view,
Modified: web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/PendingTranslateGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -105,7 +105,7 @@
view : ui.component._PendingTranslateGrid.view,
loadMask : true,
autoExpandColumn : 'name',
- bodyBorder : false,
+ border : false,
listeners : {
rowcontextmenu : function(grid, rowIndex, e)
{
Modified: web/doc-editor/trunk/js/ui/component/RepositoryTree.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/RepositoryTree.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/RepositoryTree.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -4,11 +4,11 @@
// RepositoryTree internals
// RepositoryTree root node
-ui.component._RepositoryTree.root = new Ext.tree.AsyncTreeNode({
+ui.component._RepositoryTree.root = {
+ nodeType : 'async',
id : '/',
- text : _('Repository'),
- draggable : false // disable root node dragging
-});
+ text : _('Repository')
+};
// RepositoryTree default tree loader
ui.component._RepositoryTree.loader = new Ext.tree.TreeLoader({
@@ -111,7 +111,7 @@
enableDD : false,
useArrows : true,
autoScroll : true,
- bodyBorder : false,
+ border : false,
containerScroll : true,
root : ui.component._RepositoryTree.root,
Modified: web/doc-editor/trunk/js/ui/component/StaleFileGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/StaleFileGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/StaleFileGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -203,7 +203,7 @@
view : ui.component._StaleFileGrid.view,
loadMask : true,
autoExpandColumn : 'name',
- bodyBorder : false,
+ border : false,
listeners : {
rowcontextmenu : function(grid, rowIndex, e)
{
Modified: web/doc-editor/trunk/js/ui/component/TranslatorGrid.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/TranslatorGrid.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/TranslatorGrid.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -146,7 +146,7 @@
store : ui.component._TranslatorGrid.store,
columns : ui.component._TranslatorGrid.columns,
autoExpandColumn : 'GridTransName',
-
+ sm : new Ext.grid.RowSelectionModel({singleSelect:true}),
listeners : {
render : function(grid)
{
@@ -170,11 +170,12 @@
e.stopEvent();
var TranslatorEmail = grid.store.getAt(rowIndex).data.email,
- TranslatorName = grid.store.getAt(rowIndex).data.name;
+ TranslatorName = grid.store.getAt(rowIndex).data.name,
+ tmp='';
grid.getSelectionModel().selectRow(rowIndex);
- var tmp = new Ext.menu.Menu({
+ tmp = new Ext.menu.Menu({
id : 'submenu',
items : [{
text : '<b>' + String.format(_('Send an email to {0}'), TranslatorName) + '</b>',
@@ -197,7 +198,9 @@
}).show();
}
}]
- }).showAt(e.getXY());
+ });
+ tmp.showAt(e.getXY());
+
}
}
});
Modified: web/doc-editor/trunk/js/ui/component/ViewVCDiff.js
===================================================================
--- web/doc-editor/trunk/js/ui/component/ViewVCDiff.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/component/ViewVCDiff.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -14,11 +14,11 @@
{
items : {
id : this.prefix + '-diff-' + this.fid,
- xtype : 'iframepanel',
- loadMask : true,
- defaultSrc : 'http://svn.php.net/viewvc/phpdoc/en/trunk' +
+ xtype : 'panel',
+ layout : 'fit',
+ items: [ new Ext.ux.IFrameComponent({ id: 'frame-' + this.prefix + '-diff-' + this.fid, url: 'http://svn.php.net/viewvc/phpdoc/en/trunk' +
this.fpath + this.fname +
- '?r1=' + this.rev1 + '&r2=' + this.rev2
+ '?r1=' + this.rev1 + '&r2=' + this.rev2 }) ]
}
});
ui.component.ViewVCDiff.superclass.initComponent.call(this);
Modified: web/doc-editor/trunk/js/ui/task/VCSCommitTask.js
===================================================================
--- web/doc-editor/trunk/js/ui/task/VCSCommitTask.js 2009-12-19 09:40:24 UTC (rev 292319)
+++ web/doc-editor/trunk/js/ui/task/VCSCommitTask.js 2009-12-19 09:46:52 UTC (rev 292320)
@@ -63,7 +63,7 @@
text : _('Close'),
handler : function()
{
- this.ownerCt.close();
+ this.ownerCt.ownerCt.close();
}
}]
}).show();