[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: InsertFile: Fix for double File/Media radio buttons

2017-07-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/364700 )

Change subject: InsertFile: Fix for double File/Media radio buttons
..


InsertFile: Fix for double File/Media radio buttons

Strange behaviour of ExtJS, when opening FileDialog and ImageDialog
without reloading the page, radio buttons for File/Media link type are
duplicated, seems it cannot recongnize that the radio group exists
already.

Needed to use itemId instead of id to solve this issue.

Also, added height param to FileDialog, because if you opened it after
ImageDialog, it would keep the height from it (too high)

Needs cherry-picking to REL1_27

Patch Set 2: Changed label width to fit German translation

Change-Id: Ie3a6dac1b152e4fb543e354ec34dcca3391178c6
ERM: #6653
---
M InsertFile/resources/BS.InsertFile/BaseDialog.js
M InsertFile/resources/BS.InsertFile/FileDialog.js
2 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Mglaser: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/InsertFile/resources/BS.InsertFile/BaseDialog.js 
b/InsertFile/resources/BS.InsertFile/BaseDialog.js
index c7b3379..36ee0f0 100644
--- a/InsertFile/resources/BS.InsertFile/BaseDialog.js
+++ b/InsertFile/resources/BS.InsertFile/BaseDialog.js
@@ -190,18 +190,18 @@
},
items: [{
boxLabel: 
mw.message('bs-insertfile-nstextfile').plain(),
-   id: 'ns-text-file',
+   itemId: 'ns-text-file',
name: 'ns-text',
inputValue: 'file',
checked: true,
-   width: 60
+   width: 80
},{
boxLabel: 
mw.message('bs-insertfile-nstextmedia').plain(),
-   id: 'ns-text-media',
+   itemId: 'ns-text-media',
name: 'ns-text',
inputValue: 'media',
checked: false,
-   width: 60
+   width: 80
}]
});
 
diff --git a/InsertFile/resources/BS.InsertFile/FileDialog.js 
b/InsertFile/resources/BS.InsertFile/FileDialog.js
index c14143c..78245fe 100644
--- a/InsertFile/resources/BS.InsertFile/FileDialog.js
+++ b/InsertFile/resources/BS.InsertFile/FileDialog.js
@@ -12,6 +12,7 @@
initComponent: function() {
//this is neccessary to avoid strange cross-referencing between 
the
//two instances of BS.InsertFile.BaseDialog subclasses
+   this.configPanel.height = 150;
this.configPanel.items = [];
this.callParent(arguments);
},

-- 
To view, visit https://gerrit.wikimedia.org/r/364700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3a6dac1b152e4fb543e354ec34dcca3391178c6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: InsertFile: Fix for double File/Media radio buttons

2017-07-12 Thread ItSpiderman (Code Review) 
ItSpiderman has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/364700 )

Change subject: InsertFile: Fix for double File/Media radio buttons
..

InsertFile: Fix for double File/Media radio buttons

Strange behaviour of ExtJS, when opening FileDialog and ImageDialog
without reloading the page, radio buttons for File/Media link type are
duplicated, seems it cannot recongnize that the radio group exists
already.

Needed to use itemId instead of id to solve this issue.

Also, added height param to FileDialog, because if you opened it after
ImageDialog, it would keep the height from it (too high)

Needs cherry-picking to REL1_27

Change-Id: Ie3a6dac1b152e4fb543e354ec34dcca3391178c6
ERM: #6653
---
M InsertFile/resources/BS.InsertFile/BaseDialog.js
M InsertFile/resources/BS.InsertFile/FileDialog.js
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/00/364700/1

diff --git a/InsertFile/resources/BS.InsertFile/BaseDialog.js 
b/InsertFile/resources/BS.InsertFile/BaseDialog.js
index c7b3379..2e6bad6 100644
--- a/InsertFile/resources/BS.InsertFile/BaseDialog.js
+++ b/InsertFile/resources/BS.InsertFile/BaseDialog.js
@@ -190,14 +190,14 @@
},
items: [{
boxLabel: 
mw.message('bs-insertfile-nstextfile').plain(),
-   id: 'ns-text-file',
+   itemId: 'ns-text-file',
name: 'ns-text',
inputValue: 'file',
checked: true,
width: 60
},{
boxLabel: 
mw.message('bs-insertfile-nstextmedia').plain(),
-   id: 'ns-text-media',
+   itemId: 'ns-text-media',
name: 'ns-text',
inputValue: 'media',
checked: false,
diff --git a/InsertFile/resources/BS.InsertFile/FileDialog.js 
b/InsertFile/resources/BS.InsertFile/FileDialog.js
index c14143c..78245fe 100644
--- a/InsertFile/resources/BS.InsertFile/FileDialog.js
+++ b/InsertFile/resources/BS.InsertFile/FileDialog.js
@@ -12,6 +12,7 @@
initComponent: function() {
//this is neccessary to avoid strange cross-referencing between 
the
//two instances of BS.InsertFile.BaseDialog subclasses
+   this.configPanel.height = 150;
this.configPanel.items = [];
this.callParent(arguments);
},

-- 
To view, visit https://gerrit.wikimedia.org/r/364700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3a6dac1b152e4fb543e354ec34dcca3391178c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits