Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed typo in TinyMCE. See #286

  • Loading branch information...
commit 7f286d0b0b8f150771e6ffd73e147b687bf400cc 1 parent 19dadf5
@arjan arjan authored
View
3  .gitmodules
@@ -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
1  deps/lager
@@ -0,0 +1 @@
+Subproject commit dc750f54173fc0f96a15dabdd4b6ec6f9d93de1b
View
2  modules/mod_base/lib/js/modules/tinymce3.4.7/plugins/zmedia/editor_plugin.js
@@ -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, {});
};
}
});
Please sign in to comment.
Something went wrong with that request. Please try again.