david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Aktanusa
2014-08-30 01:45:21 -04:00
parent c34bcbfc3a d997ff7652
commit da917ebc6b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CookieMonster.js
View File

@@ -426,6 +426,7 @@ CM.Disp.AddJscolor = function() {
CM.Disp.Jscolor = document.createElement('script'); CM.Disp.Jscolor = document.createElement('script');
CM.Disp.Jscolor.type = 'text/javascript'; CM.Disp.Jscolor.type = 'text/javascript';
CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js'); CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
document.head.appendChild(CM.Disp.Jscolor);
} }
CM.Disp.CreateCssArea = function() { CM.Disp.CreateCssArea = function() {

1
src/Disp.js
View File

@@ -100,6 +100,7 @@ CM.Disp.AddJscolor = function() {
CM.Disp.Jscolor = document.createElement('script'); CM.Disp.Jscolor = document.createElement('script');
CM.Disp.Jscolor.type = 'text/javascript'; CM.Disp.Jscolor.type = 'text/javascript';
CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js'); CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
document.head.appendChild(CM.Disp.Jscolor);
} }
CM.Disp.CreateCssArea = function() { CM.Disp.CreateCssArea = function() {