Merge pull request #3893 from louyihua/tinymce-ie-fix

Make TinyMCE's HTML source code editor work under Internet Explorer
This commit is contained in:
David Baumgold
2014-05-29 10:13:15 -04:00

View File

@@ -1,4 +1,4 @@
## -*- coding: utf-8 -*-
## -*- coding: utf-8 -*-
<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='static_content.html'/>
@@ -39,6 +39,12 @@
<script type="text/javascript">
window.baseUrl = "${settings.STATIC_URL}";
// Internet Explorer does not have built-in property 'window.location.origin',
// we need to create one here as some vendor code such as TinyMCE uses this.
if (!window.location.origin) {
window.location.origin = window.location.protocol + "//" + window.location.hostname
+ (window.location.port ? ':' + window.location.port : '');
}
var require = {
baseUrl: baseUrl,
waitSeconds: 60,