[MediaWiki-commits] [Gerrit] Fix paste sequence in Firefox - change (mediawiki...VisualEditor)

2013-12-10 Thread Esanders (Code Review)
Esanders has uploaded a new change for review.

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


Change subject: Fix paste sequence in Firefox
..

Fix paste sequence in Firefox

It appears that if the pasteTarget is given focus too close to the
range being set it may not take effect in time. Moving up to before
any of the selection setting logic seems to fix the issue.

Bug: 58283
Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/13/100613/1

diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index ee1095e..c9b6f78 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -839,6 +839,10 @@
ve.dm.converter.internalList = doc.getInternalList();
ve.dm.converter.getDomSubtreeFromData( context, 
this.$pasteTarget[0] );
 
+   // Giving the paste target focus too late can cause problems in 
FF (!?)
+   // so do it up here.
+   this.$pasteTarget[0].focus();
+
rangyRange = rangy.createRange( this.getElementDocument() );
// Assume that the DM node only generated one child
textNode = this.$pasteTarget.children().contents()[0];
@@ -847,7 +851,6 @@
rangyRange.setEnd( textNode, textEnd );
sel = rangy.getSelection( this.getElementDocument() );
sel.removeAllRanges();
-   this.$pasteTarget[0].focus();
sel.addRange( rangyRange, false );
 
this.beforePasteData.context = context;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Fix paste sequence in Firefox - change (mediawiki...VisualEditor)

2013-12-10 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix paste sequence in Firefox
..


Fix paste sequence in Firefox

It appears that if the pasteTarget is given focus too close to the
range being set it may not take effect in time. Moving up to before
any of the selection setting logic seems to fix the issue.

Bug: 58283
Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index ee1095e..c9b6f78 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -839,6 +839,10 @@
ve.dm.converter.internalList = doc.getInternalList();
ve.dm.converter.getDomSubtreeFromData( context, 
this.$pasteTarget[0] );
 
+   // Giving the paste target focus too late can cause problems in 
FF (!?)
+   // so do it up here.
+   this.$pasteTarget[0].focus();
+
rangyRange = rangy.createRange( this.getElementDocument() );
// Assume that the DM node only generated one child
textNode = this.$pasteTarget.children().contents()[0];
@@ -847,7 +851,6 @@
rangyRange.setEnd( textNode, textEnd );
sel = rangy.getSelection( this.getElementDocument() );
sel.removeAllRanges();
-   this.$pasteTarget[0].focus();
sel.addRange( rangyRange, false );
 
this.beforePasteData.context = context;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
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 paste sequence in Firefox - change (mediawiki...VisualEditor)

2013-12-10 Thread Catrope (Code Review)
Catrope has submitted this change and it was merged.

Change subject: Fix paste sequence in Firefox
..


Fix paste sequence in Firefox

It appears that if the pasteTarget is given focus too close to the
range being set it may not take effect in time. Moving up to before
any of the selection setting logic seems to fix the issue.

Bug: 58283
Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
(cherry picked from commit 333166e818ca949763136296fc78f8eadf348542)
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 10b7bcb..94367ce 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -840,6 +840,10 @@
ve.dm.converter.internalList = doc.getInternalList();
ve.dm.converter.getDomSubtreeFromData( context, 
this.$pasteTarget[0] );
 
+   // Giving the paste target focus too late can cause problems in 
FF (!?)
+   // so do it up here.
+   this.$pasteTarget[0].focus();
+
rangyRange = rangy.createRange( this.getElementDocument() );
// Assume that the DM node only generated one child
textNode = this.$pasteTarget.children().contents()[0];
@@ -848,7 +852,6 @@
rangyRange.setEnd( textNode, textEnd );
sel = rangy.getSelection( this.getElementDocument() );
sel.removeAllRanges();
-   this.$pasteTarget[0].focus();
sel.addRange( rangyRange, false );
 
this.beforePasteData.context = context;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bfb0ab6952863496fb3548e6804cb347d52cc57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.23wmf6
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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