Merge pull request #158 from carlosperate/ie_comment_fix

Rename Warning getAllText function for Comment object compatibility.
scratchfoundation · Aug 20, 2015 · 058760e · 058760e
2 parents 5b7fec7 + d773adb
commit 058760e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/core/block_svg.js b/core/block_svg.js
@@ -1287,9 +1287,9 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
       this.warning.dispose();
       changedState = true;
     } else if (this.warning) {
-      var oldText = this.warning.getAllText();
+      var oldText = this.warning.getText();
       this.warning.setText('', id);
-      var newText = this.warning.getAllText();
+      var newText = this.warning.getText();
       if (!newText) {
         this.warning.dispose();
       }

diff --git a/core/warning.js b/core/warning.js
@@ -88,7 +88,7 @@ Blockly.Warning.prototype.setVisible = function(visible) {
   }
   if (visible) {
     // Create the bubble to display all warnings.
-    var paragraph = Blockly.Warning.textToDom_(this.getAllText());
+    var paragraph = Blockly.Warning.textToDom_(this.getText());
     this.bubble_ = new Blockly.Bubble(
         /** @type {!Blockly.Workspace} */ (this.block_.workspace),
         paragraph, this.block_.svgPath_,
@@ -148,7 +148,7 @@ Blockly.Warning.prototype.setText = function(text, id) {
  * Get this warning's texts.
  * @return {string} All texts concatenated into one string.
  */
-Blockly.Warning.prototype.getAllText = function() {
+Blockly.Warning.prototype.getText = function() {
   var allWarnings = [];
   for (var id in this.text_) {
     allWarnings.push(this.text_[id]);