summaryrefslogtreecommitdiffabout
path: root/content
Unidiff
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/photoset-props.js38
-rw-r--r--content/photoset-props.xul1
2 files changed, 18 insertions, 21 deletions
diff --git a/content/photoset-props.js b/content/photoset-props.js
index 43dc1b9..7c816be 100644
--- a/content/photoset-props.js
+++ b/content/photoset-props.js
@@ -6,4 +6,2 @@ var psetprops = {
6 6
7 settitle: null, setdesc: null,
8 primarypic: null,
9 photos: new Array(), 7 photos: new Array(),
@@ -12,11 +10,11 @@ var psetprops = {
12 this.photoset = window.arguments[1]; 10 this.photoset = window.arguments[1];
13 this.settitle = document.getElementById('set_title'); 11 pull_elements(this,document,[
14 this.settitle.value = this.photoset.title; 12 'set_title','set_desc','primary_picture',
15 this.setdesc = document.getElementById('set_desc'); 13 'primary_picture_list'
16 this.setdesc.value = this.photoset.description; 14 ]);
17 this.primarypic = document.getElementById('primary_picture'); 15 this.set_title.value = this.photoset.title;
18 this.primarypic.src = 16 this.set_desc.value = this.photoset.description;
17 this.primary_picture.src =
19 this.fireflix.flickr.get_image_url( this.photoset, 't' ); 18 this.fireflix.flickr.get_image_url( this.photoset, 't' );
20 this.primarypic.hidden = false; 19 this.primary_picture.hidden = false;
21 this.picslist = document.getElementById('primary_picture_list');
22 20
@@ -33,3 +31,3 @@ var psetprops = {
33 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null ); 31 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
34 _this.picslist.removeAllItems(); _this.photos= new Array(); 32 _this.primary_picture_list.removeAllItems(); _this.photos= new Array();
35 var n; while(n=xp.iterateNext()) { 33 var n; while(n=xp.iterateNext()) {
@@ -42,3 +40,3 @@ var psetprops = {
42 ); 40 );
43 var ni = _this.picslist.appendItem( 41 var ni = _this.primary_picture_list.appendItem(
44 n.getAttribute('title'), _this.photos.length-1 42 n.getAttribute('title'), _this.photos.length-1
@@ -47,3 +45,3 @@ var psetprops = {
47 if(n.getAttribute('isprimary')==1) { 45 if(n.getAttribute('isprimary')==1) {
48 _this.picslist.selectedItem = ni; 46 _this.primary_picture_list.selectedItem = ni;
49 _this.pripic = _this.photos[_this.photos.length-1]; 47 _this.pripic = _this.photos[_this.photos.length-1];
@@ -51,3 +49,3 @@ var psetprops = {
51 } 49 }
52 _this.picslist.hidden = false; 50 _this.primary_picture_list.hidden = false;
53 }, function() { } 51 }, function() { }
@@ -57,6 +55,6 @@ var psetprops = {
57 var epic = ev.explicitOriginalTarget; 55 var epic = ev.explicitOriginalTarget;
58 this.picslist.selectedItem = epic; 56 this.primary_picture_list.selectedItem = epic;
59 var pic = this.photos[this.picslist.selectedItem.value]; 57 var pic = this.photos[this.primary_picture_list.selectedItem.value];
60 this.pripic = pic; 58 this.pripic = pic;
61 this.primarypic.src = 59 this.primary_picture.src =
62 this.fireflix.flickr.get_photo_url( 60 this.fireflix.flickr.get_photo_url(
@@ -69,6 +67,4 @@ var psetprops = {
69 on_accept: function() { 67 on_accept: function() {
70 this.photoset.title = 68 this.photoset.title = this.set_title.value;
71 document.getElementById('set_title').value; 69 this.photoset.description = this.set_desc.value;
72 this.photoset.description =
73 document.getElementById('set_desc').value;
74 this.photoset.server = this.pripic.server; 70 this.photoset.server = this.pripic.server;
diff --git a/content/photoset-props.xul b/content/photoset-props.xul
index e8f6d13..2efa9e6 100644
--- a/content/photoset-props.xul
+++ b/content/photoset-props.xul
@@ -14,2 +14,3 @@
14 14
15 <script src="util.js" type="application/x-javascript"/>
15 <script src="photoset-props.js" type="application/x-javascript"/> 16 <script src="photoset-props.js" type="application/x-javascript"/>