[MediaWiki-commits] [Gerrit] fix for no links in insertimage - change (mediawiki...BlueSpiceExtensions)

2015-02-27 Thread Robert Vogel (Code Review) 
Robert Vogel has submitted this change and it was merged.

Change subject: fix for no links in insertimage
..


fix for no links in insertimage

Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
---
M InsertFile/resources/BS.InsertFile/ImageDialog.js
1 file changed, 8 insertions(+), 9 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/InsertFile/resources/BS.InsertFile/ImageDialog.js 
b/InsertFile/resources/BS.InsertFile/ImageDialog.js
index 50a41d7..f584ae0 100644
--- a/InsertFile/resources/BS.InsertFile/ImageDialog.js
+++ b/InsertFile/resources/BS.InsertFile/ImageDialog.js
@@ -226,12 +226,9 @@
frame: false,
//VisualEditor stuff
imagename: this.tfFileName.getValue(),
+   noLink: this.cbxNoLink.getValue(),
src: Ext.htmlDecode(this.hdnUrl.getValue()) 
//Ext.htmlDecode(): this feels like the wrong place...
});
-
-   if(this.cbxNoLink.getValue() === true ) {
-   cfg.link = '';
-   }
 
var format = this.rgFormat.getValue();
format = format['img-type'];
@@ -339,12 +336,14 @@
if( obj.link !== ''  obj.link !== false  obj.link !== 
'false' ) {
this.cbPages.setValue( obj.link );
}
-
-   if( obj.link === '' ) {
-   this.cbxNoLink.setValue(true);
-   } else {
-   this.cbxNoLink.setValue(false);
+   if (obj.nolink === true){
+   this.cbPages.disable( );
}
+   else{
+   this.cbPages.enable( );
+   }
+
+   this.cbxNoLink.setValue(obj.nolink);
 
this.hdnUrl.setValue( obj.src );
this.isSetData = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] fix for no links in insertimage - change (mediawiki...BlueSpiceExtensions)

2015-01-29 Thread Tweichart (Code Review) 
Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/187357

Change subject: fix for no links in insertimage
..

fix for no links in insertimage

Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
---
M InsertFile/resources/BS.InsertFile/ImageDialog.js
1 file changed, 8 insertions(+), 9 deletions(-)


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

diff --git a/InsertFile/resources/BS.InsertFile/ImageDialog.js 
b/InsertFile/resources/BS.InsertFile/ImageDialog.js
index 50a41d7..f584ae0 100644
--- a/InsertFile/resources/BS.InsertFile/ImageDialog.js
+++ b/InsertFile/resources/BS.InsertFile/ImageDialog.js
@@ -226,12 +226,9 @@
frame: false,
//VisualEditor stuff
imagename: this.tfFileName.getValue(),
+   noLink: this.cbxNoLink.getValue(),
src: Ext.htmlDecode(this.hdnUrl.getValue()) 
//Ext.htmlDecode(): this feels like the wrong place...
});
-
-   if(this.cbxNoLink.getValue() === true ) {
-   cfg.link = '';
-   }
 
var format = this.rgFormat.getValue();
format = format['img-type'];
@@ -339,12 +336,14 @@
if( obj.link !== ''  obj.link !== false  obj.link !== 
'false' ) {
this.cbPages.setValue( obj.link );
}
-
-   if( obj.link === '' ) {
-   this.cbxNoLink.setValue(true);
-   } else {
-   this.cbxNoLink.setValue(false);
+   if (obj.nolink === true){
+   this.cbPages.disable( );
}
+   else{
+   this.cbPages.enable( );
+   }
+
+   this.cbxNoLink.setValue(obj.nolink);
 
this.hdnUrl.setValue( obj.src );
this.isSetData = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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