summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-11-13 21:42:51 (UTC)
committer Michael Krelin <hacker@klever.net>2006-11-13 21:42:51 (UTC)
commitee241f175fb9de69f17723a5cf31d0025a3a2fbd (patch) (unidiff)
tree56d7a4ceb3e9e3980a40acaf0a127e4ea6555f87
parent790a0930a6d9eb52020193b8f5aabf5da1075ba3 (diff)
downloadfireflix-ee241f175fb9de69f17723a5cf31d0025a3a2fbd.zip
fireflix-ee241f175fb9de69f17723a5cf31d0025a3a2fbd.tar.gz
fireflix-ee241f175fb9de69f17723a5cf31d0025a3a2fbd.tar.bz2
removing linebreaks from generated html
git-svn-id: http://svn.klever.net/kin/fireflix/trunk@217 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/generated-content.js4
-rw-r--r--content/generated-content.xul1
-rw-r--r--locale/en-US/fireflix.dtd1
3 files changed, 6 insertions, 0 deletions
diff --git a/content/generated-content.js b/content/generated-content.js
index 0ad08bb..f9addd6 100644
--- a/content/generated-content.js
+++ b/content/generated-content.js
@@ -4,14 +4,18 @@ var generated = {
4 4
5 init: function() { 5 init: function() {
6 this.fireflix = window.arguments[0]; 6 this.fireflix = window.arguments[0];
7 this.data = window.arguments[1]; 7 this.data = window.arguments[1];
8 this.databox = document.getElementById('data'); 8 this.databox = document.getElementById('data');
9 this.databox.value = this.data; 9 this.databox.value = this.data;
10 this.databox.select(); 10 this.databox.select();
11 }, 11 },
12 copy: function() { 12 copy: function() {
13 var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"] 13 var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
14 .getService(Components.interfaces.nsIClipboardHelper); 14 .getService(Components.interfaces.nsIClipboardHelper);
15 ch.copyString(this.data); 15 ch.copyString(this.data);
16 },
17 nolf: function() {
18 this.databox.value = this.data.replace(/[\r\n]/,'');
19 document.getElementById('nolf').disabled = true;
16 } 20 }
17}; 21};
diff --git a/content/generated-content.xul b/content/generated-content.xul
index 2a91efa..fd508c2 100644
--- a/content/generated-content.xul
+++ b/content/generated-content.xul
@@ -6,15 +6,16 @@
6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
7 id="generated_content" 7 id="generated_content"
8 buttons="accept" 8 buttons="accept"
9 defaultbutton="accept" 9 defaultbutton="accept"
10 title="&generated.title;" 10 title="&generated.title;"
11 onload="generated.init()" 11 onload="generated.init()"
12 > 12 >
13 13
14 <script src="generated-content.js" type="application/x-javascript"/> 14 <script src="generated-content.js" type="application/x-javascript"/>
15 15
16 <vbox class="generated wholething" flex="1"> 16 <vbox class="generated wholething" flex="1">
17 <textbox flex="1" minheight="300" minwidth="300" id="data" multiline="true" readonly="true" /> 17 <textbox flex="1" minheight="300" minwidth="300" id="data" multiline="true" readonly="true" />
18 <button id="nolf" label="&generated.nolf;" oncommand="generated.nolf()" />
18 <button id="copy" label="&generated.copy;" oncommand="generated.copy()" /> 19 <button id="copy" label="&generated.copy;" oncommand="generated.copy()" />
19 </vbox> 20 </vbox>
20</dialog> 21</dialog>
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 0e158c3..46409ed 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -64,20 +64,21 @@
64<!ENTITY panel.upload_props.filename.label "File:"> 64<!ENTITY panel.upload_props.filename.label "File:">
65<!ENTITY panel.upload_props.title.label "Title:"> 65<!ENTITY panel.upload_props.title.label "Title:">
66<!ENTITY panel.upload_props.tags.label "Tags:"> 66<!ENTITY panel.upload_props.tags.label "Tags:">
67 67
68<!ENTITY panel.uploads.upload.label "Upload"> 68<!ENTITY panel.uploads.upload.label "Upload">
69<!ENTITY panel.uploads.clear.label "Clear"> 69<!ENTITY panel.uploads.clear.label "Clear">
70<!ENTITY panel.uploads.remove.label "Remove"> 70<!ENTITY panel.uploads.remove.label "Remove">
71<!ENTITY panel.uploads.add.label "Add"> 71<!ENTITY panel.uploads.add.label "Add">
72<!ENTITY panel.uploads.generate_html "Generate HTML"> 72<!ENTITY panel.uploads.generate_html "Generate HTML">
73 73
74<!ENTITY generated.title "Fireflix: Generated content"> 74<!ENTITY generated.title "Fireflix: Generated content">
75<!ENTITY generated.copy "copy"> 75<!ENTITY generated.copy "copy">
76<!ENTITY generated.nolf "remove linebreaks">
76 77
77<!ENTITY browser.sidebar.label "Fireflix"> 78<!ENTITY browser.sidebar.label "Fireflix">
78<!ENTITY browser.sidebar.title "Fireflix"> 79<!ENTITY browser.sidebar.title "Fireflix">
79 80
80<!ENTITY photosetprops.title "Photoset properties"> 81<!ENTITY photosetprops.title "Photoset properties">
81<!ENTITY photosetprops.set_title.label "Photoset title:"> 82<!ENTITY photosetprops.set_title.label "Photoset title:">
82<!ENTITY photosetprops.set_desc.label "Photoset description:"> 83<!ENTITY photosetprops.set_desc.label "Photoset description:">
83 84