[MediaWiki-commits] [Gerrit] Pass generated content error to inspector - change (VisualEditor/VisualEditor)

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

Change subject: Pass generated content error to inspector
..


Pass generated content error to inspector

If an error is returned in generated content, pass it
to the inspector so it can be rendered there.

Bug: T113172
Change-Id: I6002d9870d2b38275245fbf48f0e19b57c41de01
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
M src/dm/nodes/ve.dm.GeneratedContentNode.js
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 444eb65..66747b1 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -159,6 +159,9 @@
this.$element.remove();
this.$element = $newElements;
}
+   } else {
+   this.generatedContentsValid = false;
+   this.model.emit( 'generatedContentsError', $newElements );
}
 
// Update focusable and resizable elements if necessary
diff --git a/src/dm/nodes/ve.dm.GeneratedContentNode.js 
b/src/dm/nodes/ve.dm.GeneratedContentNode.js
index a494432..a8a7fd2 100644
--- a/src/dm/nodes/ve.dm.GeneratedContentNode.js
+++ b/src/dm/nodes/ve.dm.GeneratedContentNode.js
@@ -19,6 +19,13 @@
 
 OO.initClass( ve.dm.GeneratedContentNode );
 
+/* Events */
+
+/**
+ * @event generatedContentsError
+ * @param {jQuery} $element Element containing the error message
+ */
+
 /* Static methods */
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6002d9870d2b38275245fbf48f0e19b57c41de01
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Pass generated content error to inspector - change (VisualEditor/VisualEditor)

2015-10-04 Thread Tchanders (Code Review) 
Tchanders has uploaded a new change for review.

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

Change subject: Pass generated content error to inspector
..

Pass generated content error to inspector

If an error is returned in generated content, pass it
to the inspector so it can be rendered there.

Bug: T113172
Change-Id: I6002d9870d2b38275245fbf48f0e19b57c41de01
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/99/243599/1

diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 444eb65..66747b1 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -159,6 +159,9 @@
this.$element.remove();
this.$element = $newElements;
}
+   } else {
+   this.generatedContentsValid = false;
+   this.model.emit( 'generatedContentsError', $newElements );
}
 
// Update focusable and resizable elements if necessary

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6002d9870d2b38275245fbf48f0e19b57c41de01
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

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