| -rw-r--r-- | content/generated-content.js | 4 | ||||
| -rw-r--r-- | content/generated-content.xul | 1 | ||||
| -rw-r--r-- | locale/en-US/fireflix.dtd | 1 |
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 @@ -1,17 +1,21 @@ var generated = { fireflix: null, data: null, init: function() { this.fireflix = window.arguments[0]; this.data = window.arguments[1]; this.databox = document.getElementById('data'); this.databox.value = this.data; this.databox.select(); }, copy: function() { var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"] .getService(Components.interfaces.nsIClipboardHelper); ch.copyString(this.data); + }, + nolf: function() { + this.databox.value = this.data.replace(/[\r\n]/,''); + document.getElementById('nolf').disabled = true; } }; 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 @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xsml-stylesheet href="fireflix.css" type="text/css"?> <!DOCTYPE dialog SYSTEM "chrome://fireflix/locale/fireflix.dtd"> <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="generated_content" buttons="accept" defaultbutton="accept" title="&generated.title;" onload="generated.init()" > <script src="generated-content.js" type="application/x-javascript"/> <vbox class="generated wholething" flex="1"> <textbox flex="1" minheight="300" minwidth="300" id="data" multiline="true" readonly="true" /> + <button id="nolf" label="&generated.nolf;" oncommand="generated.nolf()" /> <button id="copy" label="&generated.copy;" oncommand="generated.copy()" /> </vbox> </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 @@ -52,32 +52,33 @@ <!ENTITY panel.setphotos.title.tip "Picture title"> <!ENTITY panel.setphotos.taken.label "Taken"> <!ENTITY panel.setphotos.taken.tip "When the picture was taken"> <!ENTITY panel.setphotos.upload.label "Uploaded"> <!ENTITY panel.setphotos.upload.tip "When the picure was uploaded"> <!ENTITY panel.tagslist.tag.label "Tag"> <!ENTITY panel.uploadlist.file.label "File name"> <!ENTITY panel.uploadlist.title.label "Title"> <!ENTITY panel.uploadlist.status.label "Status"> <!ENTITY panel.upload_props.filename.label "File:"> <!ENTITY panel.upload_props.title.label "Title:"> <!ENTITY panel.upload_props.tags.label "Tags:"> <!ENTITY panel.uploads.upload.label "Upload"> <!ENTITY panel.uploads.clear.label "Clear"> <!ENTITY panel.uploads.remove.label "Remove"> <!ENTITY panel.uploads.add.label "Add"> <!ENTITY panel.uploads.generate_html "Generate HTML"> <!ENTITY generated.title "Fireflix: Generated content"> <!ENTITY generated.copy "copy"> +<!ENTITY generated.nolf "remove linebreaks"> <!ENTITY browser.sidebar.label "Fireflix"> <!ENTITY browser.sidebar.title "Fireflix"> <!ENTITY photosetprops.title "Photoset properties"> <!ENTITY photosetprops.set_title.label "Photoset title:"> <!ENTITY photosetprops.set_desc.label "Photoset description:"> |