github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 19:29:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

always loadScript with a script tag (#6411)

Browse Source 
to avoid Content Security Policy unsafe-line violations
This commit is contained in:
Kyle Zhao
2018-10-01 10:06:01 +08:00
committed by GitHub
parent 38b48997fc
commit 373d6e3fe6
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/components/ace-editor.js.es6
View File

@ -1,8 +1,6 @@
import loadScript from "discourse/lib/load-script";
import { observes } from "ember-addons/ember-computed-decorators";
const LOAD_ASYNC = !Ember.testing;
export default Ember.Component.extend({
mode: "css",
classNames: ["ace-wrapper"],
@ -26,7 +24,7 @@ export default Ember.Component.extend({
@observes("mode")
modeChanged() {
if (LOAD_ASYNC && this._editor && !this._skipContentChangeEvent) {
if (this._editor && !this._skipContentChangeEvent) {
this._editor.getSession().setMode("ace/mode/" + this.get("mode"));
}
},
@ -71,21 +69,17 @@ export default Ember.Component.extend({
didInsertElement() {
this._super();
loadScript("/javascripts/ace/ace.js", { scriptTag: true }).then(() => {
loadScript("/javascripts/ace/ace.js").then(() => {
window.ace.require(["ace/ace"], loadedAce => {
if (!this.element || this.isDestroying || this.isDestroyed) {
return;
}
const editor = loadedAce.edit(this.$(".ace")[0]);
if (LOAD_ASYNC) {
editor.setTheme("ace/theme/chrome");
}
editor.setTheme("ace/theme/chrome");
editor.setShowPrintMargin(false);
editor.setOptions({ fontSize: "14px" });
if (LOAD_ASYNC) {
editor.getSession().setMode("ace/mode/" + this.get("mode"));
}
editor.getSession().setMode("ace/mode/" + this.get("mode"));
editor.on("change", () => {
this._skipContentChangeEvent = true;
this.set("content", editor.getSession().getValue());