From 89a94fbd488a8b52e4ec4b341be930b709921693 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 29 Sep 2015 19:48:49 +0300 Subject: [PATCH] Fix #4 and another thing Fixed incorrect behavior on tags consisting of reserved words like "constructor" and fix regression that failed to apply submit changes when there were autofill options used --- ....0-fx.xpi => @tumblrimagesorter-1.3.1.xpi} | Bin 234282 -> 228903 bytes !Firefox addon/contents/data/animage-get.js | 18 +++++++++------- !Firefox addon/contents/data/animage-post.js | 2 +- !Firefox addon/contents/package.json | 2 +- Chrome tampermonkey/animage-get.js | 20 ++++++++++-------- Chrome tampermonkey/animage-post.js | 13 +++--------- Opera native/animage-get.js | 8 +++---- Opera native/animage-post.js | 4 ++-- 8 files changed, 32 insertions(+), 35 deletions(-) rename !Firefox addon/{tumblr_image_sorter-1.3.0-fx.xpi => @tumblrimagesorter-1.3.1.xpi} (91%) diff --git a/!Firefox addon/tumblr_image_sorter-1.3.0-fx.xpi b/!Firefox addon/@tumblrimagesorter-1.3.1.xpi similarity index 91% rename from !Firefox addon/tumblr_image_sorter-1.3.0-fx.xpi rename to !Firefox addon/@tumblrimagesorter-1.3.1.xpi index 2aad227370719ed3545c45179012c2aa96bcc88c..e71db0ad5c1eb9c058f3c598677bb12cae0ac06c 100644 GIT binary patch delta 10179 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 B?#2KB delta 15471 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
    Kdtw|mMEqWi$%A)G-v!R*AMgkpd^PJ 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 diff --git a/!Firefox addon/contents/data/animage-get.js b/!Firefox addon/contents/data/animage-get.js index 3a72721..c55ca9d 100644 --- a/!Firefox addon/contents/data/animage-get.js +++ b/!Firefox addon/contents/data/animage-get.js @@ -2,7 +2,7 @@ // ==UserScript== // @name Animage-get // @description Format file name & save path for current image by its tags -// @version 1.3 +// @version 1.3.1 // @author Seedmanc // @namespace https://github.com/Seedmanc/Tumblr-image-sorter @@ -103,7 +103,7 @@ self.port.on ('init', function(obj){ function main(record){ //Launch tag processing and handle afterwork if (document.location.href.indexOf('tumblr')==-1) //If not on tumblr - if (!(/(jpe*g|bmp|png|gif)/gi).test(document.location.href.split('.').pop())) + if (!(/(jpe?g|bmp|png|gif)/gi).test(document.location.href.split('.').pop())) return; // check if this is actually an image link DBrec=record; @@ -169,11 +169,11 @@ function analyzeTags( ) { //This is where the tag matching magic o }); //1st sorting stage, no prior knowledge about found categories $.each(tags, function(i,v){ //Divide tags for the image into 5 categories - if (folders[v]) // the "has folder" category + if (folders.hasOwnProperty(v)) // the "has folder" category fldrs.push(folders[v]) - else if (names[v]) // the "no folder name tag" category + else if (names.hasOwnProperty(v)) // the "no folder name tag" category nms.push(names[v]) - else if (meta[v]) // the "no folder meta tag" category, + else if (meta.hasOwnProperty(v)) // the "no folder meta tag" category, mt.push(meta[v]) // which doesn't count towards final folder decision, but simply adds to filename; else if (isANSI(v)) { if (tags.length==1) //If the tag is already in roman and has no folder it might be either name or meta @@ -182,11 +182,11 @@ function analyzeTags( ) { //This is where the tag matching magic o var splt=v.split(' '); if (splt.length==2) { //Some bloggers put tags for both name reading orders (name<->surname), var rvrs=splt.reverse().join(' '); - if (names[rvrs]) { // thus creating duplicating tags + if (names.hasOwnProperty(rvrs)) { // thus creating duplicating tags nms.push(names[rvrs]) // try to find database entry for reversed order first, return true; } - else if (ansi[rvrs]) // then check for duplicates + else if (ansi.hasOwnProperty(rvrs)) // then check for duplicates return true; } ansi[v]=true; @@ -364,7 +364,7 @@ function selected(e){ //Hide the corresponding roman tag from resul } ); $.each(ansi,function(ix,vl){ - if ((!unc[vl.textContent.trim()])&&(!$(vl).parent().attr('ignore'))) + if ((!unc.hasOwnProperty(vl.textContent.trim()))&&(!$(vl).parent().attr('ignore'))) $(vl).parent().removeAttr('hidden'); }); checkMatch(e); @@ -395,6 +395,8 @@ function submit(){ //Collects entered translations for missing tag ignore.push(v.id); //Mark hidden tags as ignored return true; }; + if ($(v).parent().attr('hidden')) + return true; tg=$(v).find('input.txt'); if (tg.length) tg=tg[0].value.trim(); //found translation tag diff --git a/!Firefox addon/contents/data/animage-post.js b/!Firefox addon/contents/data/animage-post.js index 7c8714e..df143e3 100644 --- a/!Firefox addon/contents/data/animage-post.js +++ b/!Firefox addon/contents/data/animage-post.js @@ -2,7 +2,7 @@ // ==UserScript== // @name Animage-post // @description Store tags for images and indicate saved state -// @version 1.3 +// @version 1.3.1 // @author Seedmanc // @namespace https://github.com/Seedmanc/Tumblr-image-sorter diff --git a/!Firefox addon/contents/package.json b/!Firefox addon/contents/package.json index 285fb35..d50b411 100644 --- a/!Firefox addon/contents/package.json +++ b/!Firefox addon/contents/package.json @@ -1,7 +1,7 @@ { "title": "Tumblr Image Sorter", "name": "tumblrimagesorter", - "version": "1.3.0", + "version": "1.3.1", "description": "Saves time on choosing folder and file name for saving tumblr images.", "main": "index.js", "author": "Seedmanc", diff --git a/Chrome tampermonkey/animage-get.js b/Chrome tampermonkey/animage-get.js index cae5518..4f9e41d 100644 --- a/Chrome tampermonkey/animage-get.js +++ b/Chrome tampermonkey/animage-get.js @@ -1,7 +1,7 @@ // ==UserScript== // @name Animage-get // @description Format file name & save path for current image by its tags -// @version 1.2 +// @version 1.3.1 // @author Seedmanc // @namespace https://github.com/Seedmanc/Tumblr-image-sorter @@ -331,7 +331,7 @@ function checkMatch(obj,fix){ //Remove trailing whitespace in object }; } catch (err) { if (!debug) - alert(err.name+': '+err.message); //Gotta always notify the user + alert(err.name+': '+err.message); //Gotta always notify the user throw err; }; //TODO: even more checks here }; @@ -368,7 +368,7 @@ function onDOMcontentLoaded(){ //Load plugins and databases href=document.location.href; if (href.indexOf('tumblr')==-1) //If not on tumblr - if (!(/(jpe*g|bmp|png|gif)/gi).test(href.split('.').pop())) // check if this is actually an image link + if (!(/(jpe?g|bmp|png|gif)/gi).test(href.split('.').pop())) // check if this is actually an image link return; $('img').wrap("
    "); $('body').append(out); @@ -435,7 +435,7 @@ function mutex(){ //Check readiness of plugins and databases when }; function main(){ //Launch tag processing and handle afterwork - $( "" ).appendTo( "head" ); //assign functions to events and whatnot + $("" ).appendTo( "head" ); //assign functions to events and whatnot $('div#output').append(port); toggleSettings(); $('input#debug').prop('checked',debug); @@ -508,7 +508,7 @@ function analyzeTags() { //This is where the tag matching magic o }); //1st sorting stage, no prior knowledge about found categories $.each(tags, function(i,v){ //Divide tags for the image into 5 categories - if (folders[v]) // the "has folder" category + if (folders.hasOwnProperty(v)) // the "has folder" category fldrs.push(folders[v]) else if (names.get(v)) // the "no folder name tag" category nms.push(names.get(v)) @@ -525,13 +525,13 @@ function analyzeTags() { //This is where the tag matching magic o nms.push(names.get(rvrs)) // try to find database entry for reversed order first, return true; } - else if (ansi[rvrs]) // then check for duplicates + else if (ansi.hasOwnProperty(rvrs)) // then check for duplicates return true; } ansi[v]=true; }; } - else + else rest.push(v); // finally the "untranslated" category }); //2nd sorting stage, now we know how many tags of each category there are @@ -691,7 +691,7 @@ function selected(e){ //Hide the corresponding roman tag from resul }); }); $.each(ansi,function(ix,vl){ - if ((!knj[vl.textContent.trim()])&&(!$(vl).parent().attr('ignore'))) + if ((!knj.hasOwnProperty(vl.textContent.trim()))&&(!$(vl).parent().attr('ignore'))) $(vl).parent().removeAttr('hidden'); }); var test={tag:e.target.value}; @@ -710,7 +710,7 @@ function mkUniq(arr){ //Sorts an array and ensures uniqueness of it return arr2.sort(); //I thought key names are already sorted in an object but for some reason they're not }; -function getFileName(fullName, full){ //Source URL processing for filename +function getFileName(fullName, full){ //Source URL processing for filename full=full || false; fullName=fullName.replace(/(#|\?).*$/gim,''); //first remove url parameters if (fullName.indexOf('xuite')!=-1) { //This blog names their images as "(digit).jpg" causing filename collisions @@ -761,6 +761,8 @@ function submit(){ //Collects entered translations for missing tag ignore.push(v.id); //Mark hidden tags as ignored return true; }; + if ($(v).parent().attr('hidden')) + return true; tg=$(v).find('input.txt'); if (tg.length) tg=tg[0].value.trim(); //found translation tag diff --git a/Chrome tampermonkey/animage-post.js b/Chrome tampermonkey/animage-post.js index aa79d17..65a5744 100644 --- a/Chrome tampermonkey/animage-post.js +++ b/Chrome tampermonkey/animage-post.js @@ -1,7 +1,7 @@ // ==UserScript== // @name Animage-post // @description Store tags for images and indicate saved state -// @version 1.2 +// @version 1.3.1 // @author Seedmanc // @namespace https://github.com/Seedmanc/Tumblr-image-sorter @@ -149,9 +149,9 @@ function loadAndExecute(url, callback){ //Load specified js library a function main(){ //Search for post IDs on page and call API to get info about them if (debug) - jQuery("div[id^='SwfStore_animage_']").css('top','0').css('left','0').css("position",'absolute').css('opacity','0.8'); + jQuery("div[id^='SwfStore_animage_']").css({'top':'0','left':'0',"position":'absolute','opacity':'0.8'}); else //Bring the flash window in or out of the view depending on the debug mode - jQuery("div[id^='SwfStore_animage_']").css('top','-2000px').css('left','-2000px').css("position",'absolute'); + jQuery("div[id^='SwfStore_animage_']").css({'top':'-2000px', 'left':'-2000px', "position":'absolute'}); if (isDash) posts=jQuery('ol.posts').find('div.post').not('.new_post') //Getting posts on dashboard is straightforward with its constant design, else { // but outside of it are all kinds of faulty designs, so we have to experiment @@ -204,13 +204,6 @@ function mutex(){ //Check readiness of libraries being loaded si main(); //when everything is loaded, proceed further } }; - -/*if (typeof masonite != 'undefined') - jQuery(window).load(function(){ //some themes require waiting till their own functions finish - onDOMContentLoaded(); - }) -else - onDOMContentLoaded();*/ function onDOMContentLoaded(){ //Load plugins diff --git a/Opera native/animage-get.js b/Opera native/animage-get.js index 65cf1be..da58815 100644 --- a/Opera native/animage-get.js +++ b/Opera native/animage-get.js @@ -350,7 +350,7 @@ function onDOMcontentLoaded(){ //load plugins and databases return; href=document.location.href; if (href.indexOf('tumblr')==-1) //if not on tumblr - if (!(/(jpe*g|bmp|png|gif)/gi).test(href.split('.').pop())) //check if this is actually an image link + if (!(/(jpe?g|bmp|png|gif)/gi).test(href.split('.').pop())) //check if this is actually an image link return; loadAndExecute("https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js",function(){ $('body')[0].appendChild(out); @@ -505,7 +505,7 @@ function analyzeTags() { //this is where the tag matching magic oc }); //1st sorting stage, no prior knowledge about found categories $.each(tags, function(i,v){ //divide tags for the image into 5 categories - if (folders[v]) // the "has folder" category + if (folders.hasOwnProperty(v)) // the "has folder" category fldrs.push(folders[v]) else if (names.get(v)) // the "no folder name tag" category nms.push(names.get(v)) @@ -522,7 +522,7 @@ function analyzeTags() { //this is where the tag matching magic oc nms.push(names.get(rvrs)) //try to find database entry for reversed order first, return true; } - else if (ansi[rvrs]) // then check for duplicates + else if (ansi.hasOwnProperty(rvrs)) // then check for duplicates return true; } ansi[v]=true; @@ -686,7 +686,7 @@ function selected(inp){ //hide the corresponding roman tag from resu } ); $.each(ansi,function(ix,vl){ //I don't even remember how and why this works - if ((!knj[vl.innerText.trim()])&&(!$(vl).parent().attr('ignore'))) + if ((!knj.hasOwnProperty(vl.innerText.trim()))&&(!$(vl).parent().attr('ignore'))) $(vl).parent().removeAttr('hidden'); //but it does } ); diff --git a/Opera native/animage-post.js b/Opera native/animage-post.js index 1f1c10a..498d0f5 100644 --- a/Opera native/animage-post.js +++ b/Opera native/animage-post.js @@ -98,9 +98,9 @@ function getID(lnk){ //extract numerical post ID from self-link function main(){ //search for post IDs on page and call API to get info about them if (debug) - jQuery("div[id^='SwfStore_animage_']").css('top','0').css('left','0').css("position",'absolute') + jQuery("div[id^='SwfStore_animage_']").css({'top':'0','left':'0',"position":'absolute'}) else //bring the flash window in or out of the view depending on the debug mode - jQuery("div[id^='SwfStore_animage_']").css('top','-2000px').css('left','-2000px').css("position",'absolute'); + jQuery("div[id^='SwfStore_animage_']").css({'top':'-2000px','left':'-2000px',"position":'absolute'}); if (isDash) posts=jQuery('ol.posts').find('div.post').not('.new_post') //getting posts on dashboard is straightforward with its constant design, else { // but outside of it are all kinds of faulty designs, so we have to experiment