fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #709 from cweider/packaging 

Packaging
This commit is contained in:
John McLear 2012-05-17 04:59:24 -07:00
parent 1043d607d0 a9eb2d4e31
commit ee11338927
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/node/utils/tar.json
View File

@ -1,12 +1,7 @@
{ {
"pad.js": [ "pad.js": [
"jquery.js" "pad.js"
, "underscore.js"
, "security.js"
, "pad.js"
, "ace2_common.js"
, "pad_utils.js" , "pad_utils.js"
, "json2.js"
, "pad_cookie.js" , "pad_cookie.js"
, "pad_editor.js" , "pad_editor.js"
, "pad_editbar.js" , "pad_editbar.js"
@ -23,13 +18,9 @@
, "farbtastic.js" , "farbtastic.js"
] ]
, "timeslider.js": [ , "timeslider.js": [
"jquery.js" "timeslider.js"
, "underscore.js"
, "security.js"
, "json2.js"
, "colorutils.js" , "colorutils.js"
, "draggable.js" , "draggable.js"
, "ace2_common.js"
, "pad_utils.js" , "pad_utils.js"
, "pad_cookie.js" , "pad_cookie.js"
, "pad_editor.js" , "pad_editor.js"
@ -46,12 +37,10 @@
, "broadcast.js" , "broadcast.js"
, "broadcast_slider.js" , "broadcast_slider.js"
, "broadcast_revisions.js" , "broadcast_revisions.js"
, "timeslider.js"
] ]
, "ace2_inner.js": [ , "ace2_inner.js": [
"ace2_common.js" "ace2_inner.js"
, "underscore.js" , "underscore.js"
, "rjquery.js"
, "AttributePool.js" , "AttributePool.js"
, "Changeset.js" , "Changeset.js"
, "ChangesetUtils.js" , "ChangesetUtils.js"
@ -66,6 +55,17 @@
, "linestylefilter.js" , "linestylefilter.js"
, "domline.js" , "domline.js"
, "AttributeManager.js" , "AttributeManager.js"
, "ace2_inner.js" ]
, "ace2_common.js": [
"ace2_common.js"
, "jquery.js"
, "rjquery.js"
, "underscore.js"
, "security.js"
, "json2.js"
, "pluginfw/plugins.js"
, "pluginfw/hooks.js"
, "pluginfw/async.js"
, "pluginfw/parent_require.js"
] ]
} }

2
src/package.json
View File

@ -10,7 +10,7 @@
"name": "Robin Buse" } "name": "Robin Buse" }
], ],
"dependencies" : { "dependencies" : {
"yajsml" : "1.1.2", "yajsml" : "1.1.3",
"request" : "2.9.100", "request" : "2.9.100",
"require-kernel" : "1.0.5", "require-kernel" : "1.0.5",
"resolve" : "0.2.1", "resolve" : "0.2.1",

17
src/static/js/ace.js
View File

@ -178,18 +178,17 @@ require.setGlobalKeyPath("require");\n\
function pushScriptsTo(buffer) { function pushScriptsTo(buffer) {
/* Folling is for packaging regular expression. */ /* Folling is for packaging regular expression. */
/* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */ /* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */
/* $$INCLUDE_JS("../javascripts/src/ace2_common.js?callback=require.define"); */
var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define'; var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define';
var ACE_COMMON = '../javascripts/src/ace2_common.js?callback=require.define';
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) { if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
buffer.push('<script type="text/javascript">'); buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]); buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");'); buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
buffer.push('<\/script>'); buffer.push('<\/script>');
} else { } else {
file = ACE_SOURCE;
buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>'); buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
buffer.push('<script type="text/javascript">'); buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>');
} }
} }
function pushStyleTagsFor(buffer, files) { function pushStyleTagsFor(buffer, files) {
@ -261,8 +260,9 @@ require.setGlobalKeyPath("require");\n\
pushStyleTagsFor(iframeHTML, includedCSS); pushStyleTagsFor(iframeHTML, includedCSS);
var includedJS = []; var includedJS = [];
var $$INCLUDE_JS = function(filename) {includedJS.push(filename)};
pushRequireScriptTo(iframeHTML); pushRequireScriptTo(iframeHTML);
pushScriptsTo(iframeHTML);
// Inject my plugins into my child. // Inject my plugins into my child.
iframeHTML.push('\ iframeHTML.push('\
<script type="text/javascript">\ <script type="text/javascript">\
@ -277,7 +277,10 @@ require.setGlobalKeyPath("require");\n\
});\ });\
</script>\ </script>\
'); ');
pushScriptsTo(iframeHTML);
iframeHTML.push('<script type="text/javascript">');
iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");');
iframeHTML.push('<\/script>');
iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>'); iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>'); iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');