Navigation

← Previous Changeset
Next Changeset →

Changeset 38

Timestamp:

06/04/08 17:40:06 (6 months ago)

Author:

bi..@lilyapp.org

Message:

add a file- bootstrap.js- that loads lily app js dynamically. fix bug where lily created addons where double loading the js

Files:

trunk/lily/lily/chrome/content/bootstrap.js (added)
trunk/lily/lily/chrome/content/export-window.xul (modified) (1 diff)
trunk/lily/lily/chrome/content/export.xul (modified) (1 diff)
trunk/lily/lily/chrome/content/exporter.js (modified) (2 diffs)
trunk/lily/lily/chrome/content/lily.xul (modified) (1 diff)
trunk/lily/lily/chrome/content/object.js (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/lily/lily/chrome/content/export-window.xul

r14	r38
5	5	<window style="background:transparent !important" id="<PROJECT-NAME>LauncherWindow" title="" hidechrome="true" width="0" height="0" persist="screenX screenY width height sizemode" windowtype="<PROJECT-NAME>:hidden" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="Lily.openAppPatch('<PATCH-FILE-NAME>',<PATCH-HIDDEN>)">
6	6
7		<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
8		<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
9
10		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/lib.js"/>
11		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/utils.js"/>
12		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/externals.js"/>
13		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/debug.js"/>
14		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/inspector.js"/>
15		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/model.js"/>
16		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/patch.js"/>
17		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/connection.js"/>
18		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/object.js"/>
19		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/services.js"/>
20		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/lily.js"/>
21		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/menus.js"/>
	7	<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/bootstrap.js"/>
22	8
23	9	<stringbundleset id="stringbundleset">

trunk/lily/lily/chrome/content/export.xul

r14	r38
8	8	<overlay id="<PROJECT-NAME>Overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
9	9
10		<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
11		<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
12
13		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/lib.js"/>
14		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/utils.js"/>
15		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/externals.js"/>
16		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/debug.js"/>
17		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/inspector.js"/>
18		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/model.js"/>
19		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/patch.js"/>
20		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/connection.js"/>
21		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/object.js"/>
22		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/services.js"/>
23		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/lily.js"/>
24		<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/menus.js"/>
	10	<script type="application/x-javascript" src="chrome://<PROJECT-NAME>/content/bootstrap.js"/>
25	11
26	12	<stringbundleset id="stringbundleset">

trunk/lily/lily/chrome/content/exporter.js

r14	r38
520	520	data = data.replace(/chrome:\/\/lily/g,("chrome://"+projectName));
521	521	LilyUtils.writeFile(tmpOut,data);
	522
	523	//bootstrap.js
	524	var tmpIn = contentIn.clone();
	525	tmpIn.append("bootstrap.js");
	526	var tmpOut = contentOut.clone();
	527	tmpOut.append("bootstrap.js");
	528	LilyUtils.writeFile(tmpOut,LilyUtils.readFile(tmpIn).replace(/chrome:\/\/lily/g,("chrome://"+projectName)));
522	529
523	530	//patch
…	…
833	840	LilyUtils.writeFile(tmpOut,LilyUtils.readFile(tmpIn).replace(/chrome:\/\/lily/g,("chrome://"+projectName)));
834	841
	842	//bootstrap.js
	843	var tmpIn = contentIn.clone();
	844	tmpIn.append("bootstrap.js");
	845	var tmpOut = contentOut.clone();
	846	tmpOut.append("bootstrap.js");
	847	LilyUtils.writeFile(tmpOut,LilyUtils.readFile(tmpIn).replace(/chrome:\/\/lily/g,("chrome://"+projectName)));
	848
835	849	//patch
836	850	var tmp = contentOut.clone();

trunk/lily/lily/chrome/content/lily.xul

r14	r38
8	8	<overlay id="LilyOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
9	9
10		<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
11		<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
12
13		<script type="application/x-javascript" src="chrome://lily/content/lib.js"/>
14		<script type="application/x-javascript" src="chrome://lily/content/utils.js"/>
15		<script type="application/x-javascript" src="chrome://lily/content/externals.js"/>
16		<script type="application/x-javascript" src="chrome://lily/content/debug.js"/>
17		<script type="application/x-javascript" src="chrome://lily/content/inspector.js"/>
18		<script type="application/x-javascript" src="chrome://lily/content/model.js"/>
19		<script type="application/x-javascript" src="chrome://lily/content/patch.js"/>
20		<script type="application/x-javascript" src="chrome://lily/content/connection.js"/>
21		<script type="application/x-javascript" src="chrome://lily/content/object.js"/>
22		<script type="application/x-javascript" src="chrome://lily/content/services.js"/>
23		<script type="application/x-javascript" src="chrome://lily/content/lily.js"/>
24		<script type="application/x-javascript" src="chrome://lily/content/menus.js"/>
25		<script type="application/x-javascript" src="chrome://lily/content/exporter.js"/>
	10	<script type="application/x-javascript" src="chrome://lily/content/bootstrap.js"/>
26	11
27	12	<script>

trunk/lily/lily/chrome/content/object.js

r14	r38
385	385	//notify listeners
386	386	this.objectMoved=function() {
387		this.parent.patchController.notifyPatchListeners(this.objID+"_moved");
	387	if(this.parent.patchController) {
	388	this.parent.patchController.notifyPatchListeners(this.objID+"_moved");
	389	}
388	390	}
389	391

lily