-rw-r--r-- | content/fireflix.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/content/fireflix.js b/content/fireflix.js index 328e9e2..995ec5c 100644 --- a/content/fireflix.js +++ b/content/fireflix.js | |||
@@ -636,64 +636,73 @@ var fireflix = { | |||
636 | } | 636 | } |
637 | if(priph) { | 637 | if(priph) { |
638 | _this.flickr.api_call( | 638 | _this.flickr.api_call( |
639 | { | 639 | { |
640 | method: 'flickr.photosets.editPhotos', | 640 | method: 'flickr.photosets.editPhotos', |
641 | auth_token: 'default', | 641 | auth_token: 'default', |
642 | photoset_id: pset.id, | 642 | photoset_id: pset.id, |
643 | primary_photo_id: priph, | 643 | primary_photo_id: priph, |
644 | photo_ids: phids.join(',') | 644 | photo_ids: phids.join(',') |
645 | }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */ | 645 | }, function() { }, function(x,s,c,m) { /* flickr.photosets.editPhotos */ |
646 | _this.flickr_failure(x,s,c,m); | 646 | _this.flickr_failure(x,s,c,m); |
647 | } | 647 | } |
648 | ); | 648 | ); |
649 | } | 649 | } |
650 | }, function(x,s,c,m) { /* flickr.photosets.getPhotos */ | 650 | }, function(x,s,c,m) { /* flickr.photosets.getPhotos */ |
651 | _this.flickr_failure(x,s,c,m); | 651 | _this.flickr_failure(x,s,c,m); |
652 | } | 652 | } |
653 | ); | 653 | ); |
654 | }, function(x,s,c,m) { /* flickr.photosets.editMeta */ | 654 | }, function(x,s,c,m) { /* flickr.photosets.editMeta */ |
655 | _this.flickr_failure(x,s,c,m); | 655 | _this.flickr_failure(x,s,c,m); |
656 | } | 656 | } |
657 | ); | 657 | ); |
658 | } | 658 | } |
659 | }, | 659 | }, |
660 | on_refresh_sets: function() { | 660 | on_refresh_sets: function() { |
661 | this.refresh_sets(); | 661 | this.refresh_sets(); |
662 | }, | 662 | }, |
663 | on_cmd_sets_html: function(csfx,ev) { | 663 | on_cmd_sets_html: function(csfx,ev) { |
664 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | 664 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); |
665 | var rv = this.build_html(this.photoset.photos,uti,utl); | 665 | var rv = this.build_html(this.photoset.photos,uti,utl); |
666 | this.popup_content(rv); | 666 | this.popup_content(rv); |
667 | }, | 667 | }, |
668 | on_cmd_setphotos_html: function(csfx,ev) { | ||
669 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | ||
670 | var rv = ''; | ||
671 | for(var p in this.photoset.photos) { | ||
672 | if(this.photoset.selection.isSelected(p)) | ||
673 | rv += this.photo_html(this.photoset.photos[p],uti,utl)+'\n'; | ||
674 | } | ||
675 | this.popup_content(rv); | ||
676 | }, | ||
668 | 677 | ||
669 | on_cmd_uploads_html: function(csfx,ev) { | 678 | on_cmd_uploads_html: function(csfx,ev) { |
670 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); | 679 | var uti = csfx.charAt(0); var utl = csfx.charAt(1); |
671 | var pids = new Array(); | 680 | var pids = new Array(); |
672 | for(var f in this.uploads.files) { | 681 | for(var f in this.uploads.files) { |
673 | if(this.uploads.selection.isSelected(f)) | 682 | if(this.uploads.selection.isSelected(f)) |
674 | if(this.uploads.files[f].photoid) | 683 | if(this.uploads.files[f].photoid) |
675 | pids.push(this.uploads.files[f].photoid); | 684 | pids.push(this.uploads.files[f].photoid); |
676 | } | 685 | } |
677 | var pp = this.uploads.rowCount*2; if(pp>500) pp = 500; | 686 | var pp = this.uploads.rowCount*2; if(pp>500) pp = 500; |
678 | var _this = this; | 687 | var _this = this; |
679 | this.flickr.api_call( | 688 | this.flickr.api_call( |
680 | { | 689 | { |
681 | method: 'flickr.photos.search', | 690 | method: 'flickr.photos.search', |
682 | auth_token: 'default', | 691 | auth_token: 'default', |
683 | extras: 'original_format', | 692 | extras: 'original_format', |
684 | user_id: 'me', | 693 | user_id: 'me', |
685 | per_page: pp | 694 | per_page: pp |
686 | }, | 695 | }, |
687 | function(xr) { | 696 | function(xr) { |
688 | var x = xr.responseXML; | 697 | var x = xr.responseXML; |
689 | var rv = ''; | 698 | var rv = ''; |
690 | for(var pn in pids) { | 699 | for(var pn in pids) { |
691 | var p = pids[pn]; | 700 | var p = pids[pn]; |
692 | var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x)); | 701 | var pp = new Photo(xp_node('/rsp/photos/photo[@id='+p+']',x)); |
693 | rv += _this.photo_html(pp,uti,utl)+'\n'; | 702 | rv += _this.photo_html(pp,uti,utl)+'\n'; |
694 | } | 703 | } |
695 | _this.popup_content(rv); | 704 | _this.popup_content(rv); |
696 | }, function(x,s,c,m) { | 705 | }, function(x,s,c,m) { |
697 | _this.flickr_failure(x,s,c,m); | 706 | _this.flickr_failure(x,s,c,m); |
698 | } | 707 | } |
699 | ); | 708 | ); |
@@ -894,64 +903,68 @@ var fireflix = { | |||
894 | for(var i in photos) { | 903 | for(var i in photos) { |
895 | var p = photos[i]; | 904 | var p = photos[i]; |
896 | rv += this.photo_html(p,uti,utl)+'\n'; | 905 | rv += this.photo_html(p,uti,utl)+'\n'; |
897 | } | 906 | } |
898 | return rv; | 907 | return rv; |
899 | }, | 908 | }, |
900 | 909 | ||
901 | popup_content: function(s) { | 910 | popup_content: function(s) { |
902 | window.openDialog( | 911 | window.openDialog( |
903 | "chrome://fireflix/content/generated-content.xul", | 912 | "chrome://fireflix/content/generated-content.xul", |
904 | null, "dialog,chrome", this, s ); | 913 | null, "dialog,chrome", this, s ); |
905 | }, | 914 | }, |
906 | copy_to_clipboard: function(s) { | 915 | copy_to_clipboard: function(s) { |
907 | var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"] | 916 | var ch = Components.classes["@mozilla.org/widget/clipboardhelper;1"] |
908 | .getService(Components.interfaces.nsIClipboardHelper); | 917 | .getService(Components.interfaces.nsIClipboardHelper); |
909 | ch.copyString(s); | 918 | ch.copyString(s); |
910 | }, | 919 | }, |
911 | openTab: function(l) { | 920 | openTab: function(l) { |
912 | var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService( | 921 | var wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService( |
913 | Components.interfaces.nsIWindowMediator ); | 922 | Components.interfaces.nsIWindowMediator ); |
914 | var bw = wm.getMostRecentWindow('navigator:browser'); | 923 | var bw = wm.getMostRecentWindow('navigator:browser'); |
915 | var b = bw.getBrowser(); | 924 | var b = bw.getBrowser(); |
916 | var t = b.addTab(l); | 925 | var t = b.addTab(l); |
917 | b.selectedTab = t; | 926 | b.selectedTab = t; |
918 | }, | 927 | }, |
919 | 928 | ||
920 | build_menus: function() { | 929 | build_menus: function() { |
921 | this.append_html_menu( | 930 | this.append_html_menu( |
922 | document.getElementById('sets_html_menu'), | 931 | document.getElementById('sets_html_menu'), |
923 | 'stm_','m_bop','cmdset_sets','cmd_sets_html' | 932 | 'stm_','m_bop','cmdset_sets','cmd_sets_html' |
924 | ); | 933 | ); |
925 | this.append_html_menu( | 934 | this.append_html_menu( |
935 | document.getElementById('setphotos_html_menu'), | ||
936 | 'stm_','m_bop','cmdset_setphotos','cmd_setphotos_html' | ||
937 | ); | ||
938 | this.append_html_menu( | ||
926 | document.getElementById('uploads_html_menu'), | 939 | document.getElementById('uploads_html_menu'), |
927 | 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' | 940 | 'stm_','m_bop','cmdset_uploads','cmd_uploads_html' |
928 | ); | 941 | ); |
929 | return; | 942 | return; |
930 | }, | 943 | }, |
931 | append_html_menu: function(m,imgt,lnkt,csid,cpfx) { | 944 | append_html_menu: function(m,imgt,lnkt,csid,cpfx) { |
932 | var mp = m.appendChild(document.createElement('menupopup')); | 945 | var mp = m.appendChild(document.createElement('menupopup')); |
933 | var t; | 946 | var t; |
934 | t=mp.appendChild(document.createElement('menuitem')); | 947 | t=mp.appendChild(document.createElement('menuitem')); |
935 | t.setAttribute('label',this.loc_strings.getString('menutitle_Images')); | 948 | t.setAttribute('label',this.loc_strings.getString('menutitle_Images')); |
936 | t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); | 949 | t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); |
937 | mp.appendChild(document.createElement('menuseparator')); | 950 | mp.appendChild(document.createElement('menuseparator')); |
938 | var cs = document.getElementById(csid); | 951 | var cs = document.getElementById(csid); |
939 | for(var iti=0;iti<imgt.length;++iti) { | 952 | for(var iti=0;iti<imgt.length;++iti) { |
940 | t = mp.appendChild(document.createElement('menu')); | 953 | t = mp.appendChild(document.createElement('menu')); |
941 | t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti))); | 954 | t.setAttribute('label',this.loc_strings.getString('urltype_'+imgt.charAt(iti))); |
942 | var smp = t.appendChild(document.createElement('menupopup')); | 955 | var smp = t.appendChild(document.createElement('menupopup')); |
943 | t=smp.appendChild(document.createElement('menuitem')); | 956 | t=smp.appendChild(document.createElement('menuitem')); |
944 | t.setAttribute('label',this.loc_strings.getString('menutitle_Links')); | 957 | t.setAttribute('label',this.loc_strings.getString('menutitle_Links')); |
945 | t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); | 958 | t.setAttribute('class','menuhead');t.setAttribute('disabled','true'); |
946 | smp.appendChild(document.createElement('menuseparator')); | 959 | smp.appendChild(document.createElement('menuseparator')); |
947 | for(var lti=0;lti<lnkt.length;++lti) { | 960 | for(var lti=0;lti<lnkt.length;++lti) { |
948 | var csfx = imgt.charAt(iti)+lnkt.charAt(lti); | 961 | var csfx = imgt.charAt(iti)+lnkt.charAt(lti); |
949 | t=smp.appendChild(document.createElement('menuitem')); | 962 | t=smp.appendChild(document.createElement('menuitem')); |
950 | t.setAttribute('label',this.loc_strings.getString('urltype_'+lnkt.charAt(lti))); | 963 | t.setAttribute('label',this.loc_strings.getString('urltype_'+lnkt.charAt(lti))); |
951 | t.setAttribute('command',cpfx+'_'+csfx); | 964 | t.setAttribute('command',cpfx+'_'+csfx); |
952 | t=cs.appendChild(document.createElement('command')); | 965 | t=cs.appendChild(document.createElement('command')); |
953 | t.setAttribute('id',cpfx+'_'+csfx); | 966 | t.setAttribute('id',cpfx+'_'+csfx); |
954 | t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)"); | 967 | t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)"); |
955 | } | 968 | } |
956 | } | 969 | } |
957 | return mp; | 970 | return mp; |