Merged from sub repository (updated ckeditor, filters - step 2)

This commit is contained in:
RainLoop Team 2014-12-01 21:34:21 +04:00
parent a57dc3720e
commit ec7324b061
427 changed files with 10909 additions and 3336 deletions

View file

@ -84,24 +84,33 @@
__simplePace(10);
window.$LAB
.script('{{BaseAppLibsScriptLink}}')
.script(window.rainloopAppData['TemplatesLink'])
.script(window.rainloopAppData['LangLink'])
.script(function () {
return [
{'src': '{{BaseAppLibsScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'},
{'src': window.rainloopAppData['TemplatesLink'], 'type': 'text/javascript', 'charset': 'utf-8'},
{'src': window.rainloopAppData['LangLink'], 'type': 'text/javascript', 'charset': 'utf-8'}
];
})
.wait(function () {
__simplePace(30);
})
.script('{{BaseAppMainScriptLink}}')
.script(function () {
return {'src': '{{BaseAppMainScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'};
})
.wait(function () {
__simplePace(20);
})
.script(function () {
return window.rainloopAppData['PluginsLink'] || null;
return window.rainloopAppData['PluginsLink'] ?
{'src': '{{BaseAppMainScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'} : null;
})
.wait(function () {
__simplePace(5);
__runBoot(false);
})
.script('{{BaseAppEditorScriptLink}}')
.script(function () {
return {'src': '{{BaseAppEditorScriptLink}}', 'type': 'text/javascript', 'charset': 'utf-8'};
})
.wait(function () {
if (window.CKEDITOR && window.__initEditor) {
window.__initEditor();