From 3388c3dfcc2a075306f790ed6ccf6d902644e63c Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 13 Jan 2015 04:32:58 -0500 Subject: [PATCH] feature(edward) add --- lib/client/edit.js | 2 +- lib/client/edward.js | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/client/edit.js b/lib/client/edit.js index 20a7fc6e..9d88ad9f 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -653,7 +653,7 @@ var CloudCmd, Util, DOM, CloudFunc, io, ace, Zip, MenuIO, Format; */ msg = DOM.load({ name : 'div', - className : 'msg', + className : 'edward-msg', parent : Element, inner : text, func : alert diff --git a/lib/client/edward.js b/lib/client/edward.js index e8d6b711..8e21d97a 100644 --- a/lib/client/edward.js +++ b/lib/client/edward.js @@ -21,7 +21,8 @@ var join, Util, DOM; } function loadFiles(callback) { - var dir = '/modules/ace-builds/src-noconflict/', + var css = '/css/edward.css', + dir = '/modules/ace-builds/src-noconflict/', url = join([ 'theme-tomorrow_night_blue', 'ext-language_tools', @@ -32,24 +33,9 @@ var join, Util, DOM; })); DOM.loadRemote('ace', function() { - DOM.load.js(url, function() { + DOM.load.parallel([url, css], function() { exec(callback); }); - - DOM.load.style({ - id : 'msg-css', - inner : '#js-view .msg {' + - 'z-index' + ': 1;' + - 'background-color' + ': #7285B7;' + - 'color' + ': #D1F1A9;' + - 'position' + ': fixed;' + - 'left' + ': 40%;' + - 'top' + ': 25px;' + - 'padding' + ': 5px;' + - 'opacity' + ': 0.9;' + - 'transition' + ': ease 0.5s;' + - '}' - }); }); } }