summaryrefslogtreecommitdiffabout
path: root/content
Unidiff
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix.js32
1 files changed, 14 insertions, 18 deletions
diff --git a/content/fireflix.js b/content/fireflix.js
index 34cfd3e..f30daee 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -569,175 +569,171 @@ var fireflix = {
569 if(prop=='is_family') this.files[ff].is_family = this.upload_is_family.checked; 569 if(prop=='is_family') this.files[ff].is_family = this.upload_is_family.checked;
570 this.tree.invalidateRow(ff); 570 this.tree.invalidateRow(ff);
571 } 571 }
572 } 572 }
573 }, 573 },
574 574
575 on_upload: function() { 575 on_upload: function() {
576 this.selToProps(); 576 this.selToProps();
577 this.batch_ids = new Array(); 577 this.batch_ids = new Array();
578 this.upload_progress.value=0; 578 this.upload_progress.value=0;
579 this.upload_progress.setAttribute('hidden','false'); 579 this.upload_progress.setAttribute('hidden','false');
580 this.upload_worker(); 580 this.upload_worker();
581 }, 581 },
582 on_clear: function() { 582 on_clear: function() {
583 this.clear_list(); 583 this.clear_list();
584 }, 584 },
585 on_remove: function() { 585 on_remove: function() {
586 if(this.selection.count) { 586 if(this.selection.count) {
587 this.tree.beginUpdateBatch(); 587 this.tree.beginUpdateBatch();
588 for(var i=this.files.length-1;i>=0;--i) { 588 for(var i=this.files.length-1;i>=0;--i) {
589 if(this.selection.isSelected(i)) { 589 if(this.selection.isSelected(i)) {
590 this.files.splice(i,1); 590 this.files.splice(i,1);
591 this.rowCount--; 591 this.rowCount--;
592 } 592 }
593 } 593 }
594 this.tree.endUpdateBatch(); 594 this.tree.endUpdateBatch();
595 this.selection.clearSelection(); 595 this.selection.clearSelection();
596 } 596 }
597 }, 597 },
598 on_add: function() { 598 on_add: function() {
599 var ifp = Components.interfaces.nsIFilePicker; 599 var ifp = Components.interfaces.nsIFilePicker;
600 var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(ifp); 600 var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(ifp);
601 fp.init(window, "Select a File", ifp.modeOpenMultiple); 601 fp.init(window, "Select a File", ifp.modeOpenMultiple);
602 fp.appendFilters(ifp.filterImages); 602 fp.appendFilters(ifp.filterImages);
603 var rv = fp.show(); 603 var rv = fp.show();
604 if(rv==ifp.returnOK) { 604 if(rv==ifp.returnOK) {
605 var ff = fp.files; 605 var ff = fp.files;
606 while(ff.hasMoreElements()) { 606 while(ff.hasMoreElements()) {
607 var f = ff.getNext(); 607 var f = ff.getNext();
608 f.QueryInterface(Components.interfaces.nsIFile); 608 f.QueryInterface(Components.interfaces.nsIFile);
609 this.add(f.path); 609 this.add(f.path);
610 } 610 }
611 } 611 }
612 }, 612 },
613 on_cmd_open: function(ev) { 613 on_cmd_open: function(ev) {
614 if(this.selection.currentIndex<0) return; 614 if(this.selection.currentIndex<0) return;
615 var f = this.files[this.selection.currentIndex]; 615 var f = this.files[this.selection.currentIndex];
616 if(f.photoid) { 616 if(f.photoid) {
617 this.fireflix.openTab( 617 this.fireflix.openTab(
618 this.fireflix.flickr.make_uploader_edit_url(f.photoid) 618 this.fireflix.flickr.make_uploader_edit_url(f.photoid)
619 ); 619 );
620 }else{ 620 }else{
621 this.fireflix.openTab( 'file://'+f.file); 621 this.fireflix.openTab( 'file://'+f.file);
622 } 622 }
623 } 623 }
624 }, 624 },
625 625
626 on_set_props: function() { 626 on_set_props: function() {
627 var pset = this.photosets.sets[this.photosets.selection.currentIndex]; 627 var pset = this.photosets.sets[this.photosets.selection.currentIndex];
628 window.openDialog( 628 window.openDialog(
629 "chrome://fireflix/content/photoset-props.xul", 629 "chrome://fireflix/content/photoset-props.xul",
630 null, "dependent,modal,dialog,chrome", this, 630 null, "dependent,modal,dialog,chrome", this,
631 pset ); 631 pset );
632 if(pset.dirty) { 632 if(pset.dirty) {
633 var _this = this; 633 var that = this;
634 this.flickr.api_call( 634 this.flickr.api_call_json(
635 { 635 {
636 method: 'flickr.photosets.editMeta', 636 method: 'flickr.photosets.editMeta',
637 auth_token: 'default', 637 auth_token: 'default',
638 photoset_id: pset.id, 638 photoset_id: pset.id,
639 title: pset.title, 639 title: pset.title,
640 description: pset.description 640 description: pset.description
641 }, function(xr) { 641 }, function(x,j) {
642 pset.dirty = false; 642 pset.dirty = false;
643 _this.flickr.api_call( 643 that.flickr.api_call_json(
644 { 644 {
645 method: 'flickr.photosets.getPhotos', 645 method: 'flickr.photosets.getPhotos',
646 auth_token: 'default', 646 auth_token: 'default',
647 photoset_id: pset.id 647 photoset_id: pset.id
648 }, function(xr) { 648 }, function(x,j) {
649 var x = xr.responseXML; 649 var pp = j.photoset.photo;
650 var xp = x.evaluate(
651 '/rsp/photoset/photo', x, null,
652 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null );
653 var phids = new Array(); 650 var phids = new Array();
654 var priph = null; 651 var priph = null;
655 var n; while(n=xp.iterateNext()) { 652 for(var i in pp) {
656 var pid = n.getAttribute('id'); 653 var pid = pp[i].id;
657 phids.push( pid ); 654 phids.push(pid);
658 if(pid==pset.primary && n.getAttribute('isprimary')!='1') 655 if(pid==pset.primary && pp[i].isprimary) priph = pid;
659 priph = pid;
660 } 656 }
661 if(priph) { 657 if(priph) {
662 _this.flickr.api_call( 658 that.flickr.api_call_json(
663 { 659 {
664 method: 'flickr.photosets.editPhotos', 660 method: 'flickr.photosets.editPhotos',
665 auth_token: 'default', 661 auth_token: 'default',
666 photoset_id: pset.id, 662 photoset_id: pset.id,
667 primary_photo_id: priph, 663 primary_photo_id: priph,
668 photo_ids: phids.join(',') 664 photo_ids: phids.join(',')
669 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */ 665 }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */
670 _this.flickr_failure(x,s,c,m); 666 that.flickr_failure(x,s,c,m);
671 } 667 }
672 ); 668 );
673 } 669 }
674 }, function(x,s,c,m) { /* flickr.photosets.getPhotos */ 670 }, function(x,s,c,m) { /* flickr.photosets.getPhotos */
675 _this.flickr_failure(x,s,c,m); 671 that.flickr_failure(x,s,c,m);
676 } 672 }
677 ); 673 );
678 }, function(x,s,c,m) { /* flickr.photosets.editMeta */ 674 }, function(x,s,c,m) { /* flickr.photosets.editMeta */
679 _this.flickr_failure(x,s,c,m); 675 that.flickr_failure(x,s,c,m);
680 } 676 }
681 ); 677 );
682 } 678 }
683 }, 679 },
684 on_refresh_sets: function() { 680 on_refresh_sets: function() {
685 this.refresh_sets(); 681 this.refresh_sets();
686 }, 682 },
687 on_cmd_sets_html: function(csfx,ev) { 683 on_cmd_sets_html: function(csfx,ev) {
688 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 684 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
689 var rv = this.build_html(this.photoset.photos,uti,utl); 685 var rv = this.build_html(this.photoset.photos,uti,utl);
690 this.popup_content(rv); 686 this.popup_content(rv);
691 }, 687 },
692 on_cmd_setphotos_html: function(csfx,ev) { 688 on_cmd_setphotos_html: function(csfx,ev) {
693 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 689 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
694 var rv = ''; 690 var rv = '';
695 for(var p in this.photoset.photos) { 691 for(var p in this.photoset.photos) {
696 if(this.photoset.selection.isSelected(p)) 692 if(this.photoset.selection.isSelected(p))
697 rv += this.photo_html(this.photoset.photos[p],uti,utl)+'\n'; 693 rv += this.photo_html(this.photoset.photos[p],uti,utl)+'\n';
698 } 694 }
699 this.popup_content(rv); 695 this.popup_content(rv);
700 }, 696 },
701 697
702 on_cmd_uploads_html: function(csfx,ev) { 698 on_cmd_uploads_html: function(csfx,ev) {
703 var uti = csfx.charAt(0); var utl = csfx.charAt(1); 699 var uti = csfx.charAt(0); var utl = csfx.charAt(1);
704 var pids = new Array(); 700 var pids = new Array();
705 for(var f in this.uploads.files) { 701 for(var f in this.uploads.files) {
706 if(this.uploads.selection.isSelected(f)) 702 if(this.uploads.selection.isSelected(f))
707 if(this.uploads.files[f].photoid) 703 if(this.uploads.files[f].photoid)
708 pids.push(this.uploads.files[f].photoid); 704 pids.push(this.uploads.files[f].photoid);
709 } 705 }
710 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500; 706 var pp = this.uploads.rowCount*2; if(pp>500) pp = 500;
711 var _this = this; 707 var _this = this;
712 this.flickr.api_call( 708 this.flickr.api_call(
713 { 709 {
714 method: 'flickr.photos.search', 710 method: 'flickr.photos.search',
715 auth_token: 'default', 711 auth_token: 'default',
716 extras: 'original_format', 712 extras: 'original_format',
717 user_id: 'me', 713 user_id: 'me',
718 per_page: pp 714 per_page: pp
719 }, 715 },
720 function(xr) { 716 function(xr) {
721 var x = xr.responseXML; 717 var x = xr.responseXML;
722 var rv = ''; 718 var rv = '';
723 for(var pn in pids) { 719 for(var pn in pids) {
724 var p = pids[pn]; 720 var p = pids[pn];
725 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x)); 721 var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x));
726 rv += _this.photo_html(pp,uti,utl)+'\n'; 722 rv += _this.photo_html(pp,uti,utl)+'\n';
727 } 723 }
728 _this.popup_content(rv); 724 _this.popup_content(rv);
729 }, function(x,s,c,m) { 725 }, function(x,s,c,m) {
730 _this.flickr_failure(x,s,c,m); 726 _this.flickr_failure(x,s,c,m);
731 } 727 }
732 ); 728 );
733 }, 729 },
734 730
735 /* 731 /*
736 * 732 *
737 */ 733 */
738 foundphotos: { 734 foundphotos: {
739 fireflix: null, 735 fireflix: null,
740 init: function(f) { 736 init: function(f) {
741 this.fireflix = f; 737 this.fireflix = f;
742 pull_elements(this,document,[ 738 pull_elements(this,document,[
743 'search_for','search_tags','search_mine', 739 'search_for','search_tags','search_mine',