Commit ef57ded8 authored by Van's avatar Van

fix editor cross-origin frame

parent 86c65610
...@@ -43,7 +43,6 @@ gulp.task('build', function () { ...@@ -43,7 +43,6 @@ gulp.task('build', function () {
'./src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.iframe-transport.js', './src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.iframe-transport.js',
'./src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js', './src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js',
'./src/main/webapp/js/lib/jquery/jquery.bowknot.min.js', './src/main/webapp/js/lib/jquery/jquery.bowknot.min.js',
'./src/main/webapp/js/lib/tiny_mce/tiny_mce.js',
// codemirror // codemirror
'./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js', './src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js',
'./src/main/webapp/js/lib/editor/placeholder.js', './src/main/webapp/js/lib/editor/placeholder.js',
......
...@@ -131,7 +131,8 @@ ...@@ -131,7 +131,8 @@
</div> </div>
</div> </div>
<script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script> <script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script>
<script src="${staticServePath}/js/lib/tiny_mce/tiny_mce.js"></script> <script src="${servePath}/js/lib/tiny_mce/tiny_mce.js"></script>
<script src="${servePath}/js/lib/KindEditor/kindeditor-min.js"></script>
<script src="${staticServePath}/js/common${miniPostfix}.js"></script> <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
<#if "" == miniPostfix> <#if "" == miniPostfix>
<script src="${staticServePath}/js/admin/admin.js"></script> <script src="${staticServePath}/js/admin/admin.js"></script>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* admin style * admin style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.1.6.3, Nov 8, 2016 * @version 2.1.6.4, Nov 9, 2016
*/ */
/* start resset */ /* start resset */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment