Permalink
Browse files

Fixed typo in TinyMCE. See #286

  • Loading branch information...
1 parent 19dadf5 commit 7f286d0b0b8f150771e6ffd73e147b687bf400cc @arjan arjan committed Jan 30, 2012
Showing with 5 additions and 1 deletion.
  1. +3 −0 .gitmodules
  2. +1 −0 deps/lager
  3. +1 −1 modules/mod_base/lib/js/modules/tinymce3.4.7/plugins/zmedia/editor_plugin.js
View
@@ -4,3 +4,6 @@
[submodule "deps/gen_smtp"]
path = deps/gen_smtp
url = git://github.com/zotonic/gen_smtp.git
+[submodule "deps/lager"]
+ path = deps/lager
+ url = https://github.com/basho/lager.git
Submodule lager added at dc750f
@@ -42,7 +42,7 @@
window.z_choose_zmedia = function(id) {
if (!id) return;
var html = window.tinyMCEzMedia.toHTML(id, {align: "block", size: "middle", crop: '', link: ''});
- ed.execCommand('mceInsertContent', false, res, {});
+ ed.execCommand('mceInsertContent', false, html, {});
};
}
});

0 comments on commit 7f286d0

Please sign in to comment.