From 362051684c493ab47966eb8836b202b58584c378 Mon Sep 17 00:00:00 2001 From: nilsbeck Date: Sun, 28 Aug 2016 19:04:49 +0200 Subject: [PATCH] bugfixes and update minor bugfix and a little change that pulls imdb data in case rotten tomato cant find a match. --- .gitignore | 5 +++++ flixrate.css | 11 +++++++++++ flixrate.js | 27 +++++++++++++++------------ icons/imdb.png | Bin 0 -> 2288 bytes manifest.json | 2 +- 5 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 .gitignore create mode 100644 icons/imdb.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0078446 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.web-extension-id +icons/logo128.png +*.zip +screen.png +screen2.png \ No newline at end of file diff --git a/flixrate.css b/flixrate.css index ccc7de0..e65394e 100644 --- a/flixrate.css +++ b/flixrate.css @@ -21,3 +21,14 @@ vertical-align: baseline; } +.imdb-logo-medium{ + width: 42px; + height: 20px; + background-image: url('data:image/png;base64,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'); + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + text-indent: -9999em; + vertical-align: baseline; +} + diff --git a/flixrate.js b/flixrate.js index c1650a1..46bad48 100644 --- a/flixrate.js +++ b/flixrate.js @@ -61,7 +61,7 @@ var myClass = $box.find('.imdb-rating').get(0).parent().attr("class"); } - + $.each(results, function(index, result) { if (hasRating) { window.console.debug("Rating was already detected: " + myClass); @@ -87,17 +87,9 @@ //extract useful data from response from omdb var annotate = function(data) { var result = []; - //I don't care for IMDb Ratings :) - // if (data.imdbID && data.imdbRating !== 'N/A') { - // result.push({ - // type: 'imdb', - // label: 'IMDb', - // rating: +data.imdbRating, - // maxRating: 10, - // details: null - // }); - // } + var hasTomatoeResult = false; if (data.tomatoMeter !== 'N/A') { + hasTomatoeResult = true; result.push({ type: 'rottenCritic', label: 'Rotten Tomatoes Critic', @@ -106,7 +98,8 @@ details: data.tomatoConsensus !== 'N/A' ? htmlNumericEntityUnescape(data.tomatoConsensus) : null }); } - if (data.rottenUser !== 'N/A') { + if (data.tomatoUserMeter !== 'N/A') { + hasTomatoeResult = true; result.push({ type: 'rottenUser', label: 'Rotten Tomatoes User', @@ -115,6 +108,16 @@ details: data.tomatoConsensus !== 'N/A' ? htmlNumericEntityUnescape(data.tomatoConsensus) : null }); } + //I don't too much care for IMDb Ratings :) + if (data.imdbID && data.imdbRating !== 'N/A' && hasTomatoeResult == false) { + result.push({ + type: 'imdb', + label: 'IMDb', + rating: +data.imdbRating, + maxRating: 10, + details: null + }); + } addRating(result); }; diff --git a/icons/imdb.png b/icons/imdb.png new file mode 100644 index 0000000000000000000000000000000000000000..cb2bcd23d02b90e7f546d3fadb3d574cb175d940 GIT binary patch literal 2288 zcmVN2bZe?^J zG%heMF)*zP3cvsW2yID3K~zXfot9}(lvfspabMz!5uHfWAS#g(Dr@F7tQNxfo7RHONsJ-Hix~qPuFPw>n8(K8}9)jlLP&AiBpyf^!TJOc8tvmtk z6^ZDmOh(7UrRaFH44u`>@$_*9ZH3i3t25B~C>VEOz-X1VrasgqX&vS%6$H8pp?CWgwIrgpkTt`k$fJs75MZ@(VG!;b< zE`e|F%*TStIQ!fe9RCtL7Lw-wLy+i2VI%pfd_mQA0(x@~w`vzgEv z_}yx>KUhxSGy*4c?Km{wT7brza~K#6VZC9x?9PCVhv9+~^toy)tOeAGlkR-c9}U-n zQFtZ-CqA2pqkBVf=14r+s&?Yo7cn@#FBZr5$K%IS%b>fv3x#=^`0j8DP98K{&JSzQ zY23^45?ZSKJ$)n<=f2NC<;`tqf4qy(J8|kj432#sj^m$)qWnrC0}@48E$V;sM{R+C zb%XKeaWF7|-9QZ&oH^;m7X#2(6pfFv=U}4iXsA`T2nujTTg?}6bQobZZGby2|Coi1 zYvy6R^C&(WDJ?SG7tOjOR^L%Q63$L`aCdzN!GUhbJF^iT`hD>Bu$SwMA3G9fk0mp@ z8E7hrWf}yb?pMO*d&79il~H91FfA>hDuRyVD>!G`CeS4AL^>U zg6*)ka?b8gn?Cuq)AYD~4&OW%~Iu4LzBT<9Yn%s1nqn)yVv;EttZ86vn*C zK=#JKS3nPR0~H(W&W^*Z>2B6%!ZZR@f6VGn@o~nM%y341wDdjP?4iHEzZ>YOLo4y9 zXb3d<|saCd=Yx2e5$VI<^`wx-dWem?se|oHYcU(;ZZIup6kb#c|W& z>8@f#yPj$MCZO4H!s<`;cfnuxB*D{z8_^%Dwu8QWpB1!Mub!Aa)0I&lf)T?9B0X^m z?p;VAN0=;X)1`^B8%a<@t`k9BIiX=IisTWjL-r=^E1-w0pnVyIfdl%&+f$8Ec0)13 zc97gq%t=twNjVlaO@by{K}Fua98r-rsxh`0G|0TyA4UzuPv1tfZN;%(X34rS=cxtM zWC3lGpzHr9sO|7UTzmxj_v?$^%suakYL5HJIgOtST53~8Ew}8661p1nz z*B`cmdU~iZKiFH2g{@sVPexgcHH=_O-S^hH{|_{Y1-+c0^CYOTJLroXUHJN9dMTpQ zH7-a^oF&KN=tZ&EF;|6eKKk$ESeO9)^X?>gu;_&EB#P-3(EXpJ{#QhsOP8TuM3gPl zz{YO|wdSa(deNSi6Lj_)LFWZ|<2|+#Q`(MscOM8-i^!i*h-)6(le5K** zy83AN{7Lw5cOu>z*bnb|IpUkI*K`AIHg;8g|Necr&H!syh+HrQ^$!nNL3{S>0T0(P z{N8*b&W>**?_>;9FxFi4S6KCVma3P1lzC9g3KNaCsW=*+?g_zE-?8xGRTmlRgZ7%w zSltfvRan0w2>&>?7IOkTuqs`PpMKaP$6jn#$%|*A#duhbUzliPev_S%oG=Z)oZpI0 z!#>Q=Opt5&c&V{*l@=3t4Xf>Kv13yJs`3}1@kS{7x(3F}9$kI(#T9D0GLiSJhPTsP z)chKQ^2>=73~8t;Tt(Hh6&1g&!-H!Zpu4>pjg?ubzO@zlvMjVb{s7gbS$I^EMSmy$ zUH3OUy1kRO3lI7Guw;jvGu+#b4hoW|Pj;Z{MkXq_)`P-K7)myytY9_nUP?nvVImrC zhBIIRGC##hzjTEXRA^CFer*Bo`@$K_)w#TPsToTX(0VroZDpyHc0@!YV5_8x63o*Un%ZRhxXNalYcvCj4&z0000< KMNUMnLSTYkyIh?B literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index bb76309..d0faa86 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "netflix-ratings", - "version": "0.3.4", + "version": "0.3.6", "description": "This Extension adds Rotten Tomatoes Critics and User Critics to movies whenever they can be matched.",