diff --git a/src/modal_dialog/main.js b/src/modal_dialog/main.js index 02ed8d665..9ceb54043 100644 --- a/src/modal_dialog/main.js +++ b/src/modal_dialog/main.js @@ -109,7 +109,7 @@ define(function(require) { /** * Set content of the modal window - * @param {string} content Content + * @param {string|HTMLElement} content Content * @return {this} * @example * modal.setContent('
Some HTML content
'); diff --git a/src/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js index 499165f6e..04ca9f629 100644 --- a/src/modal_dialog/view/ModalView.js +++ b/src/modal_dialog/view/ModalView.js @@ -28,7 +28,7 @@ define(['backbone', 'text!./../template/modal.html'], getContent: function(){ if(!this.$content) this.$content = this.$el.find('.'+this.pfx+'content #'+this.pfx+'c'); - return this.$content.get(0); + return this.$content; }, /** @@ -49,7 +49,7 @@ define(['backbone', 'text!./../template/modal.html'], updateContent: function(){ var content = this.getContent(); if(content) - content.innerHTML = this.model.get('content'); + content.html(this.model.get('content')); }, /** diff --git a/test/specs/modal/view/ModalView.js b/test/specs/modal/view/ModalView.js index 60eba5bd5..64f5dbe64 100644 --- a/test/specs/modal/view/ModalView.js +++ b/test/specs/modal/view/ModalView.js @@ -45,7 +45,7 @@ define([path + 'ModalView', 'ModalDialog/model/Modal'], it("Update content", function (){ model.set('content', 'test'); - view.getContent().innerHTML.should.equal('test'); + view.getContent().get(0).innerHTML.should.equal('test'); }); it("Get title", function (){