summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul6
-rw-r--r--content/fireflix.js1
2 files changed, 5 insertions, 2 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index e5e1742..398dd78 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -1,272 +1,274 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
3<?xml-stylesheet href="fireflix.css" type="text/css"?> 3<?xml-stylesheet href="fireflix.css" type="text/css"?>
4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd"> 4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd">
5<page 5<page
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="fireflixwindow" title="Fireflix" 7 id="fireflixwindow" title="Fireflix"
8 onload="fireflix.init()" 8 onload="fireflix.init()"
9 orient="vertical" 9 orient="vertical"
10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)" 10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)"
11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)" 11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)"
12 > 12 >
13 13
14 <script src="chrome://global/content/nsDragAndDrop.js"/> 14 <script src="chrome://global/content/nsDragAndDrop.js"/>
15 <script src="chrome://global/content/nsTransferable.js"/> 15 <script src="chrome://global/content/nsTransferable.js"/>
16 <script type="application/x-javascript" src="md5.js" /> 16 <script type="application/x-javascript" src="md5.js" />
17 <script type="application/x-javascript" src="util.js" /> 17 <script type="application/x-javascript" src="util.js" />
18 <script type="application/x-javascript" src="flickr.js" /> 18 <script type="application/x-javascript" src="flickr.js" />
19 <script type="application/x-javascript" src="fireflix.js" /> 19 <script type="application/x-javascript" src="fireflix.js" />
20 20
21 <stringbundleset> 21 <stringbundleset>
22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" /> 22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
23 </stringbundleset> 23 </stringbundleset>
24 24
25 <commandset> 25 <commandset>
26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;" 26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
27 oncommand="fireflix.on_cmd_auth()"/> 27 oncommand="fireflix.on_cmd_auth()"/>
28 <command id="cmd_auth_done" label="&panel.auth.done.label;" 28 <command id="cmd_auth_done" label="&panel.auth.done.label;"
29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/> 29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;" 30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
31 oncommand="fireflix.openTab('htp://www.flickr.com/')" /> 31 oncommand="fireflix.openTab('htp://www.flickr.com/')" />
32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;" 32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
33 oncommand="fireflix.on_cmd_auth_unauth()" /> 33 oncommand="fireflix.on_cmd_auth_unauth()" />
34 </commandset> 34 </commandset>
35 35
36 <popupset> 36 <popupset>
37 <popup id="auth_menu"> 37 <popup id="auth_menu">
38 <menuitem command="cmd_auth_auth"/> 38 <menuitem command="cmd_auth_auth"/>
39 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/> 39 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
40 <menuitem command="cmd_auth_unauth" /> 40 <menuitem command="cmd_auth_unauth" />
41 <menuseparator/> 41 <menuseparator/>
42 <menuitem command="cmd_auth_open_flickr"/> 42 <menuitem command="cmd_auth_open_flickr"/>
43 </popup> 43 </popup>
44 </popupset> 44 </popupset>
45 45
46 <commandset id="cmdset_search"> 46 <commandset id="cmdset_search">
47 <command id="cmd_search" label="&panel.search.cmd_search.label;" 47 <command id="cmd_search" label="&panel.search.cmd_search.label;"
48 oncommand="fireflix.foundphotos.search_photos()"/> 48 oncommand="fireflix.foundphotos.search_photos()"/>
49 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" 49 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
50 oncommand="fireflix.foundphotos.on_cmd_open(event)" /> 50 oncommand="fireflix.foundphotos.on_cmd_open(event)" />
51 </commandset> 51 </commandset>
52 52
53 <commandset id="cmdset_sets"> 53 <commandset id="cmdset_sets">
54 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" 54 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
55 oncommand="fireflix.on_refresh_sets()" /> 55 oncommand="fireflix.on_refresh_sets()" />
56 <command id="cmd_set_props" label="&panel.sets.cmd_properties;" 56 <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
57 oncommand="fireflix.on_set_props()" disabled="true" /> 57 oncommand="fireflix.on_set_props()" disabled="true" />
58 </commandset> 58 </commandset>
59 59
60 <popupset> 60 <popupset>
61 <popup id="sets_menu"> 61 <popup id="sets_menu">
62 <menuitem command="cmd_set_props"/> 62 <menuitem command="cmd_set_props"/>
63 <menuitem command="cmd_refresh_sets"/> 63 <menuitem command="cmd_refresh_sets"/>
64 <menuseparator/> 64 <menuseparator/>
65 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/> 65 <menu label="&panel.sets.generate_html;" id="sets_html_menu"/>
66 </popup> 66 </popup>
67 </popupset> 67 </popupset>
68 68
69 <commandset id="cmdset_uploads"> 69 <commandset id="cmdset_uploads">
70 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" 70 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
71 oncommand="fireflix.uploads.on_clear()" /> 71 oncommand="fireflix.uploads.on_clear()" />
72 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" 72 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
73 oncommand="fireflix.uploads.on_upload()" /> 73 oncommand="fireflix.uploads.on_upload()" />
74 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 74 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
75 oncommand="fireflix.uploads.on_remove()" /> 75 oncommand="fireflix.uploads.on_remove()" />
76 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 76 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
77 oncommand="fireflix.uploads.on_add()" /> 77 oncommand="fireflix.uploads.on_add()" />
78 </commandset> 78 </commandset>
79 79
80 <popupset> 80 <popupset>
81 <popup id="uploads_menu"> 81 <popup id="uploads_menu">
82 <menuitem command="cmd_uploads_add"/> 82 <menuitem command="cmd_uploads_add"/>
83 <menuitem command="cmd_uploads_clear"/> 83 <menuitem command="cmd_uploads_clear"/>
84 <menuitem command="cmd_uploads_remove"/> 84 <menuitem command="cmd_uploads_remove"/>
85 <menuseparator/> 85 <menuseparator/>
86 <menuitem command="cmd_uploads_upload"/> 86 <menuitem command="cmd_uploads_upload"/>
87 <menuseparator/> 87 <menuseparator/>
88 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 88 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
89 </popup> 89 </popup>
90 </popupset> 90 </popupset>
91 91
92 <vbox class="wholething" flex="1"> 92 <vbox class="wholething" flex="1">
93 93
94 <groupbox context="auth_menu"> 94 <groupbox context="auth_menu">
95 <caption label="&panel.auth_info;"/> 95 <caption label="&panel.auth_info;"/>
96 <hbox> 96 <hbox>
97 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/> 97 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/>
98 <button id="b_auth" command="cmd_auth_auth"/> 98 <button id="b_auth" command="cmd_auth_auth"/>
99 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/> 99 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
100 <button command="cmd_auth_open_flickr" 100 <button command="cmd_auth_open_flickr"
101 tooltiptext="&panel.auth.flickr.tip;"/> 101 tooltiptext="&panel.auth.flickr.tip;"/>
102 </hbox> 102 </hbox>
103 </groupbox> 103 </groupbox>
104 104
105 <tabbox flex="1" id="fireflix_tabs"> 105 <tabbox flex="1" id="fireflix_tabs">
106 106
107 <tabs> 107 <tabs>
108 <tab label="&panel.tabs.search;"/> 108 <tab label="&panel.tabs.search;"/>
109 <tab label="&panel.tabs.sets;"/> 109 <tab label="&panel.tabs.sets;"/>
110 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 110 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
111 <tab id="tab_upload" label="&panel.tabs.upload;"/> 111 <tab id="tab_upload" label="&panel.tabs.upload;"/>
112 </tabs> 112 </tabs>
113 113
114 <tabpanels flex="1"> 114 <tabpanels flex="1">
115 115
116 <tabpanel id="tabpanel_search" flex="1"> 116 <tabpanel id="tabpanel_search" flex="1">
117 <vbox flex="1"> 117 <vbox flex="1">
118 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 118 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
119 <hbox> 119 <hbox>
120 <label control="search_for" value="&panel.search.search_for.label;" 120 <label control="search_for" value="&panel.search.search_for.label;"
121 accesskey="s"/> 121 accesskey="s"/>
122 <textbox id="search_for" flex="1"/> 122 <textbox id="search_for" flex="1"/>
123 </hbox> 123 </hbox>
124 <hbox> 124 <hbox>
125 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 125 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
126 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 126 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
127 accesskey="t" /> 127 accesskey="t" />
128 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 128 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
129 <spacer flex="1"/> 129 <spacer flex="1"/>
130 <button command="cmd_search"/> 130 <button command="cmd_search"/>
131 </hbox> 131 </hbox>
132 </groupbox> 132 </groupbox>
133 <tree id="searchresults" rows="2" flex="1" 133 <tree id="searchresults" rows="2" flex="1"
134 onselect="fireflix.foundphotos.on_select()" 134 onselect="fireflix.foundphotos.on_select()"
135 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 135 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
136 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 136 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
137 fireflix.foundphotos.on_cmd_open(event)"> 137 fireflix.foundphotos.on_cmd_open(event)">
138 <treecols> 138 <treecols>
139 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 139 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
140 </treecols> 140 </treecols>
141 <treechildren/> 141 <treechildren/>
142 </tree> 142 </tree>
143 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 143 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
144 <vbox width="100" pack="center"> 144 <vbox width="100" pack="center">
145 <hbox pack="center"> 145 <hbox pack="center">
146 <image id="search_photo"/> 146 <image id="search_photo"/>
147 </hbox> 147 </hbox>
148 </vbox> 148 </vbox>
149 <vbox flex="1"> 149 <vbox flex="1">
150 <label id="searchresult_title"/> 150 <label id="searchresult_title" crop="end"/>
151 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> 151 <hbox flex="1" pack="center">
152 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
153 </hbox>
152 <hbox pack="end"> 154 <hbox pack="end">
153 <button command="cmd_search_open"/> 155 <button command="cmd_search_open"/>
154 </hbox> 156 </hbox>
155 </vbox> 157 </vbox>
156 </groupbox> 158 </groupbox>
157 </vbox> 159 </vbox>
158 </tabpanel> 160 </tabpanel>
159 161
160 <tabpanel id="tabpanel_sets" flex="1" 162 <tabpanel id="tabpanel_sets" flex="1"
161 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 163 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
162 document.getElementById('setphotos').focus()"> 164 document.getElementById('setphotos').focus()">
163 <vbox flex="1"> 165 <vbox flex="1">
164 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()" 166 <tree id="setslist" rows="2" onselect="fireflix.photosets.on_select()"
165 flex="1" context="sets_menu" 167 flex="1" context="sets_menu"
166 > 168 >
167 <treecols> 169 <treecols>
168 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/> 170 <treecol id="sl_name" label="&panel.sets.name.label;" flex="4" crop="end" align="start" tooltiptext="&panel.sets.name.tip;"/>
169 <splitter class="tree-splitter" /> 171 <splitter class="tree-splitter" />
170 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" /> 172 <treecol id="sl_photos" label="&panel.sets.photos.label;" flex="1" align="end" tooltiptext="&panel.sets.photos.tip;" />
171 </treecols> 173 </treecols>
172 <treechildren/> 174 <treechildren/>
173 </tree> 175 </tree>
174 <hbox> 176 <hbox>
175 <button command="cmd_refresh_sets" /> 177 <button command="cmd_refresh_sets" />
176 <button command="cmd_set_props" /> 178 <button command="cmd_set_props" />
177 </hbox> 179 </hbox>
178 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()" 180 <tree id="setphotos" rows="2" onselect="fireflix.photoset.on_select()"
179 flex="1"> 181 flex="1">
180 <treecols> 182 <treecols>
181 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" /> 183 <treecol id="sp_title" label="&panel.setphotos.title.label;" flex="1" crop="end" align="start" tooltiptext="&panel.setphotos.title.tip;" />
182 <splitter class="tree-splitter" /> 184 <splitter class="tree-splitter" />
183 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" /> 185 <treecol id="sp_taken" label="&panel.setphotos.taken.label;" crop="end" align="start" tooltiptext="&panel.setphotos.taken.tip;" hidden="true" />
184 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" /> 186 <treecol id="sp_upload" label="&panel.setphotos.upload.label;" crop="end" align="start" tooltiptext="&panel.setphotos.upload.tip;" hidden="true" />
185 </treecols> 187 </treecols>
186 <treechildren/> 188 <treechildren/>
187 </tree> 189 </tree>
188 <groupbox id="set_photo_props" orient="horizontal"> 190 <groupbox id="set_photo_props" orient="horizontal">
189 <vbox width="100" pack="center"> 191 <vbox width="100" pack="center">
190 <hbox pack="center"> 192 <hbox pack="center">
191 <image id="set_photo" hidden="true"/> 193 <image id="set_photo" hidden="true"/>
192 </hbox> 194 </hbox>
193 </vbox> 195 </vbox>
194 <spacer flex="1"/> 196 <spacer flex="1"/>
195 </groupbox> 197 </groupbox>
196 </vbox> 198 </vbox>
197 </tabpanel> 199 </tabpanel>
198 200
199 <tabpanel id="tabpanel_tags"> 201 <tabpanel id="tabpanel_tags">
200 <listbox id="tagslist" rows="8" flex="1"> 202 <listbox id="tagslist" rows="8" flex="1">
201 <listhead> 203 <listhead>
202 <listheader label="&panel.tagslist.tag.label;"/> 204 <listheader label="&panel.tagslist.tag.label;"/>
203 </listhead> 205 </listhead>
204 <listcols> 206 <listcols>
205 <listcol flex="1"/> 207 <listcol flex="1"/>
206 </listcols> 208 </listcols>
207 </listbox> 209 </listbox>
208 </tabpanel> 210 </tabpanel>
209 211
210 <tabpanel id="tabpanel_upload"> 212 <tabpanel id="tabpanel_upload">
211 <vbox flex="1"> 213 <vbox flex="1">
212 <tree id="uploadlist" rows="2" flex="1" 214 <tree id="uploadlist" rows="2" flex="1"
213 onselect="fireflix.uploads.selectionChanged()" 215 onselect="fireflix.uploads.selectionChanged()"
214 context="uploads_menu"> 216 context="uploads_menu">
215 <treecols> 217 <treecols>
216 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/> 218 <treecol id="up_file" label="&panel.uploadlist.file.label;" flex="4" crop="start" align="start"/>
217 <splitter class="tree-splitter" /> 219 <splitter class="tree-splitter" />
218 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" /> 220 <treecol id="up_title" label="&panel.uploadlist.title.label;" flex="5" crop="end" align="start" />
219 <splitter class="tree-splitter" /> 221 <splitter class="tree-splitter" />
220 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" /> 222 <treecol id="up_status" label="&panel.uploadlist.status.label;" flex="1" crop="end" align="start" />
221 </treecols> 223 </treecols>
222 <treechildren/> 224 <treechildren/>
223 </tree> 225 </tree>
224 <progressmeter id="upload_progress" mode="undetermined" hidden="true" /> 226 <progressmeter id="upload_progress" mode="undetermined" hidden="true" />
225 <groupbox id="upload_file_props" orient="horizontal" hidden="true"> 227 <groupbox id="upload_file_props" orient="horizontal" hidden="true">
226 <image id="upload_file_preview" width="100" height="100" /> 228 <image id="upload_file_preview" width="100" height="100" />
227 <grid flex="1"> 229 <grid flex="1">
228 <columns> 230 <columns>
229 <column/> 231 <column/>
230 <column flex="1"/> 232 <column flex="1"/>
231 </columns> 233 </columns>
232 <rows> 234 <rows>
233 <row> 235 <row>
234 <label control="upload_filename" 236 <label control="upload_filename"
235 value="&panel.upload_props.filename.label;" /> 237 value="&panel.upload_props.filename.label;" />
236 <textbox id="upload_filename" 238 <textbox id="upload_filename"
237 oninput="fireflix.uploads.propsToSel('filename')"/> 239 oninput="fireflix.uploads.propsToSel('filename')"/>
238 </row> 240 </row>
239 <row> 241 <row>
240 <label control="upload_title" value="&panel.upload_props.title.label;" /> 242 <label control="upload_title" value="&panel.upload_props.title.label;" />
241 <textbox id="upload_title" 243 <textbox id="upload_title"
242 oninput="fireflix.uploads.propsToSel('title')"/> 244 oninput="fireflix.uploads.propsToSel('title')"/>
243 </row> 245 </row>
244 <row> 246 <row>
245 <label control="uplod_tags" value="&panel.upload_props.tags.label;" /> 247 <label control="uplod_tags" value="&panel.upload_props.tags.label;" />
246 <textbox id="upload_tags" 248 <textbox id="upload_tags"
247 oninput="fireflix.uploads.propsToSel('tags')"/> 249 oninput="fireflix.uploads.propsToSel('tags')"/>
248 </row> 250 </row>
249 <!-- TODO: description, public, friend, family --> 251 <!-- TODO: description, public, friend, family -->
250 </rows> 252 </rows>
251 </grid> 253 </grid>
252 </groupbox> 254 </groupbox>
253 <hbox> 255 <hbox>
254 <button command="cmd_uploads_add" /> 256 <button command="cmd_uploads_add" />
255 <spacer flex="1"/> 257 <spacer flex="1"/>
256 <button command="cmd_uploads_remove" /> 258 <button command="cmd_uploads_remove" />
257 <spacer flex="1"/> 259 <spacer flex="1"/>
258 <button command="cmd_uploads_clear" /> 260 <button command="cmd_uploads_clear" />
259 </hbox> 261 </hbox>
260 <hbox pack="center"> 262 <hbox pack="center">
261 <button command="cmd_uploads_upload" flex="1"/> 263 <button command="cmd_uploads_upload" flex="1"/>
262 </hbox> 264 </hbox>
263 </vbox> 265 </vbox>
264 </tabpanel> 266 </tabpanel>
265 267
266 </tabpanels> 268 </tabpanels>
267 269
268 </tabbox> 270 </tabbox>
269 271
270 </vbox> 272 </vbox>
271 273
272</page> 274</page>
diff --git a/content/fireflix.js b/content/fireflix.js
index f180379..e144aae 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -397,510 +397,511 @@ var fireflix = {
397 window.setTimeout(_this.upload_to,0,_this); 397 window.setTimeout(_this.upload_to,0,_this);
398 } 398 }
399 ); 399 );
400 return; 400 return;
401 } 401 }
402 } 402 }
403 dump('uploading done\n'); 403 dump('uploading done\n');
404 this.on_finish_upload(); 404 this.on_finish_upload();
405 }, 405 },
406 upload_to: function(_this) { _this.upload_worker(); }, 406 upload_to: function(_this) { _this.upload_worker(); },
407 on_file_upload: function(f) { 407 on_file_upload: function(f) {
408 this.cmd_uploads_upload.setAttribute('disabled','true'); 408 this.cmd_uploads_upload.setAttribute('disabled','true');
409 for(var fi in this.files) { 409 for(var fi in this.files) {
410 if(this.files[fi].file==f.file) { 410 if(this.files[fi].file==f.file) {
411 this.tree.ensureRowIsVisible(fi); 411 this.tree.ensureRowIsVisible(fi);
412 this.selection.rangedSelect(fi,fi,false); 412 this.selection.rangedSelect(fi,fi,false);
413 this.selection.currentIndex = fi; 413 this.selection.currentIndex = fi;
414 this.selToProps(); 414 this.selToProps();
415 break; 415 break;
416 } 416 }
417 } 417 }
418 }, 418 },
419 on_finish_upload: function() { 419 on_finish_upload: function() {
420 if(this.batch_ids.length) { 420 if(this.batch_ids.length) {
421 var psn = prompt(this.fireflix.loc_strings.getString('postUploadPhotoset')); 421 var psn = prompt(this.fireflix.loc_strings.getString('postUploadPhotoset'));
422 if(psn!=null) { 422 if(psn!=null) {
423 var pids = this.batch_ids.join(','); 423 var pids = this.batch_ids.join(',');
424 var ppid = this.batch_ids[0]; 424 var ppid = this.batch_ids[0];
425 var _this = this; 425 var _this = this;
426 this.fireflix.flickr.api_call( 426 this.fireflix.flickr.api_call(
427 { 427 {
428 method: 'flickr.photosets.create', 428 method: 'flickr.photosets.create',
429 auth_token: 'default', 429 auth_token: 'default',
430 title: psn, 430 title: psn,
431 primary_photo_id: ppid 431 primary_photo_id: ppid
432 }, function(x) { 432 }, function(x) {
433 var npid = 433 var npid =
434 x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id'); 434 x.responseXML.getElementsByTagName('photoset').item(0).getAttribute('id');
435 _this.fireflix.flickr.api_call( 435 _this.fireflix.flickr.api_call(
436 { 436 {
437 method: 'flickr.photosets.editPhotos', 437 method: 'flickr.photosets.editPhotos',
438 auth_token: 'default', 438 auth_token: 'default',
439 photoset_id: npid, 439 photoset_id: npid,
440 primary_photo_id: ppid, 440 primary_photo_id: ppid,
441 photo_ids: pids 441 photo_ids: pids
442 }, function(x) { 442 }, function(x) {
443 _this.fireflix.refresh_sets(); 443 _this.fireflix.refresh_sets();
444 }, function(x,s,c,m) { 444 }, function(x,s,c,m) {
445 _this.fireflix.flickr_failure(x,s,c,m); 445 _this.fireflix.flickr_failure(x,s,c,m);
446 } 446 }
447 ); 447 );
448 }, function(x,s,c,m) { 448 }, function(x,s,c,m) {
449 _this.fireflix.flickr_failure(x,s,c,m); 449 _this.fireflix.flickr_failure(x,s,c,m);
450 } 450 }
451 ); 451 );
452 } 452 }
453 } 453 }
454 this.selection.clearSelection(); 454 this.selection.clearSelection();
455 this.cmd_uploads_upload.setAttribute('disabled','false'); 455 this.cmd_uploads_upload.setAttribute('disabled','false');
456 this.upload_progress.setAttribute('hidden','true'); 456 this.upload_progress.setAttribute('hidden','true');
457 }, 457 },
458 458
459 clear_list: function() { 459 clear_list: function() {
460 this.tree.beginUpdateBatch(); 460 this.tree.beginUpdateBatch();
461 this.rowCount = 0; 461 this.rowCount = 0;
462 this.files = new Array(); 462 this.files = new Array();
463 this.tree.endUpdateBatch(); 463 this.tree.endUpdateBatch();
464 this.selToProps(); 464 this.selToProps();
465 }, 465 },
466 selectionChanged: function() { 466 selectionChanged: function() {
467 this.selToProps(); 467 this.selToProps();
468 }, 468 },
469 disableProps: function() { 469 disableProps: function() {
470 this.upload_filename.value=''; 470 this.upload_filename.value='';
471 this.upload_filename.disabled = true; 471 this.upload_filename.disabled = true;
472 this.upload_title.value=''; 472 this.upload_title.value='';
473 this.upload_title.disabled = true; 473 this.upload_title.disabled = true;
474 this.upload_file_preview.src = null; 474 this.upload_file_preview.src = null;
475 this.upload_file_props.hidden = true; 475 this.upload_file_props.hidden = true;
476 this.upload_tags.value=''; 476 this.upload_tags.value='';
477 this.upload_tags.disabled = true; 477 this.upload_tags.disabled = true;
478 }, 478 },
479 selToProps: function() { 479 selToProps: function() {
480 if(!this.selection.count) { 480 if(!this.selection.count) {
481 this.disableProps(); 481 this.disableProps();
482 }else if(this.selection.count==1) { 482 }else if(this.selection.count==1) {
483 var f=this.files[this.selection.currentIndex]; 483 var f=this.files[this.selection.currentIndex];
484 if(f==null || f.state!='pending') { 484 if(f==null || f.state!='pending') {
485 this.disableProps(); 485 this.disableProps();
486 }else{ 486 }else{
487 this.upload_filename.value = f.file; 487 this.upload_filename.value = f.file;
488 this.upload_filename.disabled = false; 488 this.upload_filename.disabled = false;
489 this.upload_title.value = f.title; 489 this.upload_title.value = f.title;
490 this.upload_title.disabled = false; 490 this.upload_title.disabled = false;
491 this.upload_file_preview.src = 'file:///'+f.file; 491 this.upload_file_preview.src = 'file:///'+f.file;
492 this.upload_file_props.hidden = false; 492 this.upload_file_props.hidden = false;
493 this.upload_tags.value = f.tags; 493 this.upload_tags.value = f.tags;
494 this.upload_tags.disabled = false; 494 this.upload_tags.disabled = false;
495 } 495 }
496 }else{ 496 }else{
497 var ftitle = null; var onetitle = true; 497 var ftitle = null; var onetitle = true;
498 var ftags = null; var onetag = true; 498 var ftags = null; var onetag = true;
499 var fs = 0; 499 var fs = 0;
500 for(var ff in this.files) { 500 for(var ff in this.files) {
501 if(this.selection.isSelected(ff) && this.files[ff].state=='pending' ) { 501 if(this.selection.isSelected(ff) && this.files[ff].state=='pending' ) {
502 ++fs; 502 ++fs;
503 if(ftitle==null) { 503 if(ftitle==null) {
504 ftitle = this.files[ff].title; 504 ftitle = this.files[ff].title;
505 }else if(ftitle!=this.files[ff].title) { 505 }else if(ftitle!=this.files[ff].title) {
506 onetitle = false; 506 onetitle = false;
507 } 507 }
508 if(ftags==null) { 508 if(ftags==null) {
509 ftags = this.files[ff].tags; 509 ftags = this.files[ff].tags;
510 }else if(ftags!=this.files[ff].tags) { 510 }else if(ftags!=this.files[ff].tags) {
511 onetag = false; 511 onetag = false;
512 } 512 }
513 } 513 }
514 } 514 }
515 if(fs) { 515 if(fs) {
516 this.upload_filename.value=''; 516 this.upload_filename.value='';
517 this.upload_filename.disabled = true; 517 this.upload_filename.disabled = true;
518 if(onetitle) 518 if(onetitle)
519 this.upload_title.value = ftitle; 519 this.upload_title.value = ftitle;
520 this.upload_title.disabled = false; 520 this.upload_title.disabled = false;
521 if(onetag) 521 if(onetag)
522 this.upload_tags.value = ftags; 522 this.upload_tags.value = ftags;
523 this.upload_tags.disabled = false; 523 this.upload_tags.disabled = false;
524 this.upload_file_preview.src = null; 524 this.upload_file_preview.src = null;
525 this.upload_file_props.hidden = false; 525 this.upload_file_props.hidden = false;
526 }else 526 }else
527 this.disableProps(); 527 this.disableProps();
528 } 528 }
529 }, 529 },
530 propsToSel: function(prop) { 530 propsToSel: function(prop) {
531 if(this.selection.count<=0) return; 531 if(this.selection.count<=0) return;
532 for(var ff in this.files) { 532 for(var ff in this.files) {
533 if(this.selection.isSelected(ff) && this.files[ff].state=='pending') { 533 if(this.selection.isSelected(ff) && this.files[ff].state=='pending') {
534 if(prop=='filename') 534 if(prop=='filename')
535 this.files[ff].file = this.upload_filename.value; 535 this.files[ff].file = this.upload_filename.value;
536 if(prop=='title') 536 if(prop=='title')
537 this.files[ff].title = this.upload_title.value; 537 this.files[ff].title = this.upload_title.value;
538 if(prop=='tags') 538 if(prop=='tags')
539 this.files[ff].tags = this.upload_tags.value; 539 this.files[ff].tags = this.upload_tags.value;
540 this.tree.invalidateRow(ff); 540 this.tree.invalidateRow(ff);
541 } 541 }
542 } 542 }
543 }, 543 },
544 544
545 on_upload: function() { 545 on_upload: function() {
546 this.selToProps(); 546 this.selToProps();
547 this.batch_ids = new Array(); 547 this.batch_ids = new Array();
548 this.upload_progress.value=0; 548 this.upload_progress.value=0;
549 this.upload_progress.setAttribute('hidden','false'); 549 this.upload_progress.setAttribute('hidden','false');
550 this.upload_worker(); 550 this.upload_worker();
551 }, 551 },
552 on_clear: function() { 552 on_clear: function() {
553 this.clear_list(); 553 this.clear_list();
554 }, 554 },
555 on_remove: function() { 555 on_remove: function() {
556 if(this.selection.count) { 556 if(this.selection.count) {
557 this.tree.beginUpdateBatch(); 557 this.tree.beginUpdateBatch();
558 for(var i=this.files.length-1;i>=0;--i) { 558 for(var i=this.files.length-1;i>=0;--i) {
559 if(this.selection.isSelected(i)) { 559 if(this.selection.isSelected(i)) {
560 this.files.splice(i,1); 560 this.files.splice(i,1);
561 this.rowCount--; 561 this.rowCount--;
562 } 562 }
563 } 563 }
564 this.tree.endUpdateBatch(); 564 this.tree.endUpdateBatch();
565 this.selection.clearSelection(); 565 this.selection.clearSelection();
566 } 566 }
567 }, 567 },
568 on_add: function() { 568 on_add: function() {
569 var ifp = Components.interfaces.nsIFilePicker; 569 var ifp = Components.interfaces.nsIFilePicker;
570 var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(ifp); 570 var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(ifp);
571 fp.init(window, "Select a File", ifp.modeOpenMultiple); 571 fp.init(window, "Select a File", ifp.modeOpenMultiple);
572 fp.appendFilters(ifp.filterImages); 572 fp.appendFilters(ifp.filterImages);
573 var rv = fp.show(); 573 var rv = fp.show();
574 if(rv==ifp.returnOK) { 574 if(rv==ifp.returnOK) {
575 var ff = fp.files; 575 var ff = fp.files;
576 while(ff.hasMoreElements()) { 576 while(ff.hasMoreElements()) {
577 var f = ff.getNext(); 577 var f = ff.getNext();
578 f.QueryInterface(Components.interfaces.nsIFile); 578 f.QueryInterface(Components.interfaces.nsIFile);
579 this.add(f.path); 579 this.add(f.path);
580 } 580 }
581 } 581 }
582 } 582 }
583 }, 583 },
584 584
585 on_set_props: function() { 585 on_set_props: function() {
586 var pset = this.photosets.sets[this.photosets.selection.currentIndex]; 586 var pset = this.photosets.sets[this.photosets.selection.currentIndex];
587 window.openDialog( 587 window.openDialog(
588 "chrome://fireflix/content/photoset-props.xul", 588 "chrome://fireflix/content/photoset-props.xul",
589 null, "dependent,modal,dialog,chrome", this, 589 null, "dependent,modal,dialog,chrome", this,
590 pset ); 590 pset );
591 if(pset.dirty) { 591 if(pset.dirty) {
592 var _this = this; 592 var _this = this;
593 this.flickr.api_call( 593 this.flickr.api_call(
594 { 594 {
595 method: 'flickr.photosets.editMeta', 595 method: 'flickr.photosets.editMeta',
596 auth_token: 'default', 596 auth_token: 'default',
597 photoset_id: pset.id, 597 photoset_id: pset.id,
598 title: pset.title, 598 title: pset.title,
599 description: pset.description 599 description: pset.description
600 }, function(xr) { 600 }, function(xr) {
601 pset.dirty = false; 601 pset.dirty = false;
602 _this.flickr.api_call( 602 _this.flickr.api_call(
603 { 603 {
604 method: 'flickr.photosets.getPhotos', 604 method: 'flickr.photosets.getPhotos',
605 auth_token: 'default', 605 auth_token: 'default',
606 photoset_id: pset.id 606 photoset_id: pset.id
607 }, function(xr) { 607 }, function(xr) {
608 var x = xr.responseXML; 608 var x = xr.responseXML;
609 var xp = x.evaluate( 609 var xp = x.evaluate(
610 '/rsp/photoset/photo', x, null, 610 '/rsp/photoset/photo', x, null,
611 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 611 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
612 var phids = new Array(); 612 var phids = new Array();
613 var priph = null; 613 var priph = null;
614 var n; while(n=xp.iterateNext()) { 614 var n; while(n=xp.iterateNext()) {
615 var pid = n.getAttribute('id'); 615 var pid = n.getAttribute('id');
616 phids.push( pid ); 616 phids.push( pid );
617 if(pid==pset.primary && n.getAttribute('isprimary')!='1') 617 if(pid==pset.primary && n.getAttribute('isprimary')!='1')
618 priph = pid; 618 priph = pid;
619 } 619 }
620 if(priph) { 620 if(priph) {
621 _this.flickr.api_call( 621 _this.flickr.api_call(
622 { 622 {
623 method: 'flickr.photosets.editPhotos', 623 method: 'flickr.photosets.editPhotos',
624 auth_token: 'default', 624 auth_token: 'default',
625 photoset_id: pset.id, 625 photoset_id: pset.id,
626 primary_photo_id: priph, 626 primary_photo_id: priph,
627 photo_ids: phids.join(',') 627 photo_ids: phids.join(',')
628 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */ 628 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */
629 _this.flickr_failure(x,s,c,m); 629 _this.flickr_failure(x,s,c,m);
630 } 630 }
631 ); 631 );
632 } 632 }
633 }, function(x,s,c,m) { /* flickr.photosets.getPhotos */ 633 }, function(x,s,c,m) { /* flickr.photosets.getPhotos */
634 _this.flickr_failure(x,s,c,m); 634 _this.flickr_failure(x,s,c,m);
635 } 635 }
636 ); 636 );
637 }, function(x,s,c,m) { /* flickr.photosets.editMeta */ 637 }, function(x,s,c,m) { /* flickr.photosets.editMeta */
638 _this.flickr_failure(x,s,c,m); 638 _this.flickr_failure(x,s,c,m);
639 } 639 }
640 ); 640 );
641 } 641 }
642 }, 642 },
643 on_refresh_sets: function() { 643 on_refresh_sets: function() {
644 this.refresh_sets(); 644 this.refresh_sets();
645 }, 645 },
646 on_cmd_sets_html: function(csfx,ev) { 646 on_cmd_sets_html: function(csfx,ev) {
647 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 647 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
648 var rv = this.build_html(this.photoset.photos,uti,utl); 648 var rv = this.build_html(this.photoset.photos,uti,utl);
649 this.popup_content(rv); 649 this.popup_content(rv);
650 }, 650 },
651 651
652 on_cmd_uploads_html: function(csfx,ev) { 652 on_cmd_uploads_html: function(csfx,ev) {
653 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 653 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
654 var pids = new Array(); 654 var pids = new Array();
655 for(var f in this.uploads.files) { 655 for(var f in this.uploads.files) {
656 if(this.uploads.selection.isSelected(f)) 656 if(this.uploads.selection.isSelected(f))
657 if(this.uploads.files[f].photoid) 657 if(this.uploads.files[f].photoid)
658 pids.push(this.uploads.files[f].photoid); 658 pids.push(this.uploads.files[f].photoid);
659 } 659 }
660 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500; 660 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500;
661 var _this = this; 661 var _this = this;
662 this.flickr.api_call( 662 this.flickr.api_call(
663 { 663 {
664 method: 'flickr.photos.search', 664 method: 'flickr.photos.search',
665 auth_token: 'default', 665 auth_token: 'default',
666 extras: 'original_format', 666 extras: 'original_format',
667 user_id: 'me', 667 user_id: 'me',
668 per_page: pp 668 per_page: pp
669 }, 669 },
670 function(xr) { 670 function(xr) {
671 var x = xr.responseXML; 671 var x = xr.responseXML;
672 var rv = ''; 672 var rv = '';
673 for(var pn in pids) { 673 for(var pn in pids) {
674 var p = pids[pn]; 674 var p = pids[pn];
675 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x)); 675 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
676 rv += _this.photo_html(pp,uti,utl)+'\n'; 676 rv += _this.photo_html(pp,uti,utl)+'\n';
677 } 677 }
678 _this.popup_content(rv); 678 _this.popup_content(rv);
679 }, function(x,s,c,m) { 679 }, function(x,s,c,m) {
680 _this.flickr_failure(x,s,c,m); 680 _this.flickr_failure(x,s,c,m);
681 } 681 }
682 ); 682 );
683 }, 683 },
684 684
685 /* 685 /*
686 * 686 *
687 */ 687 */
688 foundphotos: { 688 foundphotos: {
689 fireflix: null, 689 fireflix: null,
690 init: function(f) { 690 init: function(f) {
691 this.fireflix = f; 691 this.fireflix = f;
692 pull_elements(this,document,[ 692 pull_elements(this,document,[
693 'search_for','search_tags','search_mine', 693 'search_for','search_tags','search_mine',
694 'searchresult_props','search_photo', 694 'searchresult_props','search_photo',
695 'searchresult_title','searchresult_description' 695 'searchresult_title','searchresult_description'
696 ]); 696 ]);
697 document.getElementById('searchresults').view = this; 697 document.getElementById('searchresults').view = this;
698 }, 698 },
699 photos: new Array(), 699 photos: new Array(),
700 rowCount: 0, 700 rowCount: 0,
701 getCellText: function(r,c) { 701 getCellText: function(r,c) {
702 var p = this.photos[r]; 702 var p = this.photos[r];
703 if(c.id=='sr_title') return p.title; 703 if(c.id=='sr_title') return p.title;
704 return c.id; 704 return c.id;
705 }, 705 },
706 setTree: function(t) { this.tree = t }, 706 setTree: function(t) { this.tree = t },
707 isContainer: function(r) { return false }, 707 isContainer: function(r) { return false },
708 isSeparator: function(r) { return false }, 708 isSeparator: function(r) { return false },
709 isSorted: function(r) { return false }, 709 isSorted: function(r) { return false },
710 getLevel: function(r) { return 0 }, 710 getLevel: function(r) { return 0 },
711 getImageSrc: function(r,c) { return null }, 711 getImageSrc: function(r,c) { return null },
712 getRowProperties: function(r,p) { }, 712 getRowProperties: function(r,p) { },
713 getCellProperties: function(cid,cel,p) { }, 713 getCellProperties: function(cid,cel,p) { },
714 getColumnProperties: function(cid,cel,p) { }, 714 getColumnProperties: function(cid,cel,p) { },
715 cycleHeader: function(cid,e) { }, 715 cycleHeader: function(cid,e) { },
716 getParentIndex: function(r) { return -1 }, 716 getParentIndex: function(r) { return -1 },
717 drop: function(r,o) { }, 717 drop: function(r,o) { },
718 canDropBeforeAfter: function(r,b) { return false }, 718 canDropBeforeAfter: function(r,b) { return false },
719 719
720 importXPR: function(xp) { 720 importXPR: function(xp) {
721 this.selection.clearSelection(); 721 this.selection.clearSelection();
722 this.selection.currentIndex = -1; 722 this.selection.currentIndex = -1;
723 this.searchresult_props.hidden = true; 723 this.searchresult_props.hidden = true;
724 this.tree.beginUpdateBatch(); 724 this.tree.beginUpdateBatch();
725 this.photos = new Array(); 725 this.photos = new Array();
726 var n; while(n=xp.iterateNext()) { 726 var n; while(n=xp.iterateNext()) {
727 this.photos.push(new Photo(n)); 727 this.photos.push(new Photo(n));
728 } 728 }
729 this.rowCount = this.photos.length; 729 this.rowCount = this.photos.length;
730 this.tree.endUpdateBatch(); 730 this.tree.endUpdateBatch();
731 }, 731 },
732 search_photos: function() { 732 search_photos: function() {
733 var pars = { 733 var pars = {
734 method: 'flickr.photos.search', 734 method: 'flickr.photos.search',
735 auth_token: 'default', 735 auth_token: 'default',
736 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo' 736 extras: 'license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo'
737 }; 737 };
738 if(this.search_mine.checked) 738 if(this.search_mine.checked)
739 pars.user_id='me'; 739 pars.user_id='me';
740 if(this.search_tags.checked) { 740 if(this.search_tags.checked) {
741 pars.tags=this.search_for.value.split(/ +/).join(','); 741 pars.tags=this.search_for.value.split(/ +/).join(',');
742 }else{ 742 }else{
743 pars.text=this.search_for.value; 743 pars.text=this.search_for.value;
744 } 744 }
745 var _this = this; 745 var _this = this;
746 this.fireflix.flickr.api_call( pars, 746 this.fireflix.flickr.api_call( pars,
747 function(xr) { 747 function(xr) {
748 var x = xr.responseXML; 748 var x = xr.responseXML;
749 var xp = x.evaluate( 749 var xp = x.evaluate(
750 '/rsp/photos/photo', x, null, 750 '/rsp/photos/photo', x, null,
751 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 751 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
752 _this.importXPR(xp); 752 _this.importXPR(xp);
753 _this.tree.ensureRowIsVisible(0); 753 _this.tree.ensureRowIsVisible(0);
754 _this.on_select(); 754 _this.on_select();
755 }, function(x,s,c,m) { 755 }, function(x,s,c,m) {
756 _this.fireflix.flickr_failure(x,s,c,m); 756 _this.fireflix.flickr_failure(x,s,c,m);
757 } 757 }
758 ); 758 );
759 }, 759 },
760 render_description_frame: function(content) { 760 render_description_frame: function(content) {
761 if(!content) { 761 if(!content) {
762 this.searchresult_description.innerHTML = ''; 762 this.searchresult_description.innerHTML = '';
763 }else{ 763 }else{
764 this.searchresult_description.innerHTML = content?content:''; 764 this.searchresult_description.innerHTML = content?content:'';
765 /* of all linking elements flickr only allows a */ 765 /* of all linking elements flickr only allows a */
766 var as = this.searchresult_description.getElementsByTagName('a'); 766 var as = this.searchresult_description.getElementsByTagName('a');
767 for(var a=0;a<as.length;++a) 767 for(var a=0;a<as.length;++a)
768 as.item(a).setAttribute('target','_blank'); 768 as.item(a).setAttribute('target','_blank');
769 } 769 }
770 }, 770 },
771 on_select: function() { 771 on_select: function() {
772 if(this.selection.currentIndex<0) { 772 if(this.selection.currentIndex<0) {
773 this.searchresult_props.hidden = true; 773 this.searchresult_props.hidden = true;
774 }else{ 774 }else{
775 var p = this.photos[this.selection.currentIndex]; 775 var p = this.photos[this.selection.currentIndex];
776 if(!p) { 776 if(!p) {
777 this.searchresult_props.hidden = true; 777 this.searchresult_props.hidden = true;
778 }else{ 778 }else{
779 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t'); 779 this.search_photo.src = this.fireflix.flickr.make_photo_url(p,'t');
780 this.searchresult_title.value = p.title; 780 this.searchresult_title.value = p.title;
781 this.searchresult_title.tooltipText = p.title;
781 this.render_description_frame(null); 782 this.render_description_frame(null);
782 if(p.description==null && p.description==undefined) { 783 if(p.description==null && p.description==undefined) {
783 var pid = p.id; 784 var pid = p.id;
784 var ci = this.selection.currentIndex; 785 var ci = this.selection.currentIndex;
785 var _this = this; 786 var _this = this;
786 this.fireflix.flickr.api_call( 787 this.fireflix.flickr.api_call(
787 { 788 {
788 method: 'flickr.photos.getInfo', 789 method: 'flickr.photos.getInfo',
789 auth_token: 'default', 790 auth_token: 'default',
790 photo_id: p.id, 791 photo_id: p.id,
791 secret: p.secret 792 secret: p.secret
792 }, function(xr) { 793 }, function(xr) {
793 var pp = _this.photos[ci]; 794 var pp = _this.photos[ci];
794 if(ci==_this.selection.currentIndex && pp.id==pid) { 795 if(ci==_this.selection.currentIndex && pp.id==pid) {
795 var n = xp_node('/rsp/photo',xr.responseXML); 796 var n = xp_node('/rsp/photo',xr.responseXML);
796 pp.fromNode_(n); 797 pp.fromNode_(n);
797 _this.render_description_frame(pp.description); 798 _this.render_description_frame(pp.description);
798 } 799 }
799 }, function(x,s,c,m) { 800 }, function(x,s,c,m) {
800 _this.fireflix.flickr_failure(x,s,c,m); 801 _this.fireflix.flickr_failure(x,s,c,m);
801 } 802 }
802 ); 803 );
803 this.searchresult_props.hidden = false; 804 this.searchresult_props.hidden = false;
804 }else{ 805 }else{
805 this.render_description_frame(p.description); 806 this.render_description_frame(p.description);
806 } 807 }
807 } 808 }
808 } 809 }
809 }, 810 },
810 on_cmd_open: function(ev) { 811 on_cmd_open: function(ev) {
811 if(this.selection.currentIndex<0) 812 if(this.selection.currentIndex<0)
812 return; 813 return;
813 var p = this.photos[this.selection.currentIndex]; 814 var p = this.photos[this.selection.currentIndex];
814 if(!p.id) 815 if(!p.id)
815 return; 816 return;
816 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p')); 817 this.fireflix.openTab(this.fireflix.flickr.make_photo_url(p,'p'));
817 } 818 }
818 }, 819 },
819 820
820 photo_html: function(p,i,l) { 821 photo_html: function(p,i,l) {
821 // TODO: add alt/title when possible 822 // TODO: add alt/title when possible
822 var rv = 823 var rv =
823 '<a href="'+this.flickr.make_photo_url(p,l)+'">' + 824 '<a href="'+this.flickr.make_photo_url(p,l)+'">' +
824 '<img src="'+this.flickr.make_photo_url(p,i)+'" />'+ 825 '<img src="'+this.flickr.make_photo_url(p,i)+'" />'+
825 '</a>'; 826 '</a>';
826 return rv; 827 return rv;
827 }, 828 },
828 build_html: function(photos,uti,utl) { 829 build_html: function(photos,uti,utl) {
829 var rv = ''; 830 var rv = '';
830 for(var i in photos) { 831 for(var i in photos) {
831 var p = photos[i]; 832 var p = photos[i];
832 rv += this.photo_html(p,utl,uti)+'\n'; 833 rv += this.photo_html(p,utl,uti)+'\n';
833 } 834 }
834 return rv; 835 return rv;
835 }, 836 },
836 837
837 popup_content: function(s) { 838 popup_content: function(s) {
838 window.openDialog( 839 window.openDialog(
839 "chrome://fireflix/content/generated-content.xul", 840 "chrome://fireflix/content/generated-content.xul",
840 null, "dialog,chrome", this, s ); 841 null, "dialog,chrome", this, s );
841 }, 842 },
842 copy_to_clipboard: function(s) { 843 copy_to_clipboard: function(s) {
843 var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"] 844 var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
844 .getService(Components.interfaces.nsIClipboardHelper); 845 .getService(Components.interfaces.nsIClipboardHelper);
845 ch.copyString(s); 846 ch.copyString(s);
846 }, 847 },
847 openTab: function(l) { 848 openTab: function(l) {
848 var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService( 849 var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(
849 Components.interfaces.nsIWindowMediator ); 850 Components.interfaces.nsIWindowMediator );
850 var bw = wm.getMostRecentWindow('navigator:browser'); 851 var bw = wm.getMostRecentWindow('navigator:browser');
851 var b = bw.getBrowser(); 852 var b = bw.getBrowser();
852 var t = b.addTab(l); 853 var t = b.addTab(l);
853 b.selectedTab = t; 854 b.selectedTab = t;
854 }, 855 },
855 856
856 build_menus: function() { 857 build_menus: function() {
857 this.append_html_menu( 858 this.append_html_menu(
858 document.getElementById('sets_html_menu'), 859 document.getElementById('sets_html_menu'),
859 'stm_','m_bop','cmdset_sets','cmd_sets_html' 860 'stm_','m_bop','cmdset_sets','cmd_sets_html'
860 ); 861 );
861 this.append_html_menu( 862 this.append_html_menu(
862 document.getElementById('uploads_html_menu'), 863 document.getElementById('uploads_html_menu'),
863 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' 864 'stm_','m_bop','cmdset_uploads','cmd_uploads_html'
864 ); 865 );
865 return; 866 return;
866 }, 867 },
867 append_html_menu: function(m,imgt,lnkt,csid,cpfx) { 868 append_html_menu: function(m,imgt,lnkt,csid,cpfx) {
868 var mp = m.appendChild(document.createElement('menupopup')); 869 var mp = m.appendChild(document.createElement('menupopup'));
869 var t; 870 var t;
870 t=mp.appendChild(document.createElement('menuitem')); 871 t=mp.appendChild(document.createElement('menuitem'));
871 t.setAttribute('label',this.loc_strings.getString('menutitle_Images')); 872 t.setAttribute('label',this.loc_strings.getString('menutitle_Images'));
872 t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); 873 t.setAttribute('class','menuhead');t.setAttribute('disabled','true');
873 mp.appendChild(document.createElement('menuseparator')); 874 mp.appendChild(document.createElement('menuseparator'));
874 var cs = document.getElementById(csid); 875 var cs = document.getElementById(csid);
875 for(var iti=0;iti<imgt.length;++iti) { 876 for(var iti=0;iti<imgt.length;++iti) {
876 t = mp.appendChild(document.createElement('menu')); 877 t = mp.appendChild(document.createElement('menu'));
877 t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti))); 878 t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti)));
878 var smp = t.appendChild(document.createElement('menupopup')); 879 var smp = t.appendChild(document.createElement('menupopup'));
879 t=smp.appendChild(document.createElement('menuitem')); 880 t=smp.appendChild(document.createElement('menuitem'));
880 t.setAttribute('label',this.loc_strings.getString('menutitle_Links')); 881 t.setAttribute('label',this.loc_strings.getString('menutitle_Links'));
881 t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); 882 t.setAttribute('class','menuhead');t.setAttribute('disabled','true');
882 smp.appendChild(document.createElement('menuseparator')); 883 smp.appendChild(document.createElement('menuseparator'));
883 for(var lti=0;lti<lnkt.length;++lti) { 884 for(var lti=0;lti<lnkt.length;++lti) {
884 var csfx = imgt.charAt(iti)+lnkt.charAt(lti); 885 var csfx = imgt.charAt(iti)+lnkt.charAt(lti);
885 t=smp.appendChild(document.createElement('menuitem')); 886 t=smp.appendChild(document.createElement('menuitem'));
886 t.setAttribute('label',this.loc_strings.getString('urltype_'+lnkt.charAt(lti))); 887 t.setAttribute('label',this.loc_strings.getString('urltype_'+lnkt.charAt(lti)));
887 t.setAttribute('command',cpfx+'_'+csfx); 888 t.setAttribute('command',cpfx+'_'+csfx);
888 t=cs.appendChild(document.createElement('command')); 889 t=cs.appendChild(document.createElement('command'));
889 t.setAttribute('id',cpfx+'_'+csfx); 890 t.setAttribute('id',cpfx+'_'+csfx);
890 t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)"); 891 t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)");
891 } 892 }
892 } 893 }
893 return mp; 894 return mp;
894 }, 895 },
895 896
896 flickr_failure: function(x,s,c,m) { 897 flickr_failure: function(x,s,c,m) {
897 if(c==98) { // Invalid auth token 898 if(c==98) { // Invalid auth token
898 this.flickr.reset_token(); 899 this.flickr.reset_token();
899 this.set_auth_state(false,false); 900 this.set_auth_state(false,false);
900 return; 901 return;
901 } 902 }
902 // TODO: is that beauty? 903 // TODO: is that beauty?
903 alert('flickr api call failed\n'+c+' '+m); 904 alert('flickr api call failed\n'+c+' '+m);
904 } 905 }
905 906
906}; 907};