Skip to content

Commit

Permalink
Update to v4.1.0.22 (#125)
Browse files Browse the repository at this point in the history
* Moved to `/plugin/`

Moved the `plugin.*.js` files to the `/plugin/` folder.

* Fixed major error in `plugn.js`. It would cause the `?*` pattern to fail
  • Loading branch information
Ephellon committed Dec 2, 2019
1 parent eb1b151 commit 35e26b0
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 15 deletions.
Binary file modified moz.xpi
Binary file not shown.
Binary file modified moz.zip
Binary file not shown.
11 changes: 7 additions & 4 deletions moz/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,14 @@
}

.web-to-plex-prompt-header {
text-align: left !important;
border-bottom-color: #222 !important;
border-bottom-color: #222 !important;
border-bottom-width: 1px !important;
border-top-left-radius: 3px !important;
border-top-right-radius: 3px !important;
overflow: hidden;
text-align: left !important;
text-overflow: ellpsis;
white-space: nowrap;

top: 0 !important;
}
Expand Down Expand Up @@ -242,8 +245,8 @@
width: 30px !important;

float: right !important;
margin-right: -9px !important;
margin-top: -42px !important;
margin-right: -2% !important;
margin-top: -8% !important;
padding: 0 !important;
}

Expand Down
2 changes: 1 addition & 1 deletion moz/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage_url": "https://github.com/SpaceK33z/web-to-plex/",

"manifest_version": 2,
"version": "4.1.0.21",
"version": "4.1.0.22",
// Firefox Support =>
"applications": {
"gecko": {
Expand Down
2 changes: 1 addition & 1 deletion moz/plugn.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ return (
// *.
.replace(/\\.\\*/g,'(?:\\\\.[^\\\\/\\\\.]+)?')
// .*
.replace(/([\\/\\?\\&\\#])\\*/g,'$1[^$]*')
.replace(/([\\/\\?\\&\\#])\\*/g,'\\\\$1[^$]*')
// /* OR ?* OR &* OR #*
, 'i')
).test
Expand Down
4 changes: 2 additions & 2 deletions moz/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,11 @@ let configuration, init, Update;
prompt = furnish('div.web-to-plex-prompt', {},
furnish('div.web-to-plex-prompt-body', { style: `background-image: url(${ IMG_URL.noise_background }), url(${ IMG_URL.background }); background-size: auto, cover;` },
// The prompt's title
furnish('h1.web-to-plex-prompt-header', { innerHTML: `${ title }${ year? ` (${ year })`: '' } <em>\u2014 ${ type }</em>` }),
furnish('h1.web-to-plex-prompt-header', { innerHTML: `${ title }${ year? ` (${ year })`: '' }` }),

// The prompt's items
furnish('div.web-to-plex-prompt-options', {},
furnish('div.web-to-plex-prompt-option', { innerHTML: `${ i? `<a href="https://imdb.com/title/${i}/?ref=web_to_plex" ${s}>${i}</a>`: '/' } \u2014 ${ t? `<a href="https://themoviedb.org/${type=='show'?'tv':type}/${t}" ${s}>${t}</a>`: '/' } \u2014 ${ v? `<a href="https://thetvdb.com/series/${title.replace(/\s+/g,'-').replace(/&/g,'and').replace(/[^\w\-]+/g,'')}#${v}" ${s}>${v}</a>`: '/' }` }),
furnish('div.web-to-plex-prompt-option', { innerHTML: `${ type } \u2014 ${ i? `<a href="https://imdb.com/title/${i}/?ref=web_to_plex" ${s}>${i}</a>`: '/' } \u2014 ${ t? `<a href="https://themoviedb.org/${type=='show'?'tv':type}/${t}" ${s}>${t}</a>`: '/' } \u2014 ${ v? `<a href="https://thetvdb.com/series/${title.replace(/\s+/g,'-').replace(/&/g,'and').replace(/[^\w\-]+/g,'')}#${v}" ${s}>${v}</a>`: '/' }` }),
(
__CONFIG__.PromptQuality?
P_QUA = furnish('select.quality', { onchange: event => options.quality = event.target.value }, ...profiles[type].map(Q => furnish('option', { value: Q.id }, Q.name))):
Expand Down
Binary file modified src.crx
Binary file not shown.
Binary file modified src.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage_url": "https://github.com/SpaceK33z/web-to-plex/",

"manifest_version": 2,
"version": "4.1.0.21",
"version": "4.1.0.22",
// Firefox Support =>
// "applications": {
// "gecko": {
Expand Down
2 changes: 1 addition & 1 deletion src/plugn.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ return (
// *.
.replace(/\\.\\*/g,'(?:\\\\.[^\\\\/\\\\.]+)?')
// .*
.replace(/([\\/\\?\\&\\#])\\*/g,'$1[^$]*')
.replace(/([\\/\\?\\&\\#])\\*/g,'\\\\$1[^$]*')
// /* OR ?* OR &* OR #*
, 'i')
).test
Expand Down
9 changes: 6 additions & 3 deletions src/sites/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,14 @@
}

.web-to-plex-prompt-header {
text-align: left !important;
border-bottom-color: #222 !important;
border-bottom-width: 1px !important;
border-top-left-radius: 3px !important;
border-top-right-radius: 3px !important;
overflow: hidden;
text-align: left !important;
text-overflow: ellpsis;
white-space: nowrap;

top: 0 !important;
}
Expand Down Expand Up @@ -242,8 +245,8 @@
width: 30px !important;

float: right !important;
margin-right: -9px !important;
margin-top: -42px !important;
margin-right: -2% !important;
margin-top: -8% !important;
padding: 0 !important;
}

Expand Down
4 changes: 2 additions & 2 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,11 @@ let configuration, init, Update;
prompt = furnish('div.web-to-plex-prompt', {},
furnish('div.web-to-plex-prompt-body', { style: `background-image: url(${ IMG_URL.noise_background }), url(${ IMG_URL.background }); background-size: auto, cover;` },
// The prompt's title
furnish('h1.web-to-plex-prompt-header', { innerHTML: `${ title }${ year? ` (${ year })`: '' } <em>\u2014 ${ type }</em>` }),
furnish('h1.web-to-plex-prompt-header', { innerHTML: `${ title }${ year? ` (${ year })`: '' }` }),

// The prompt's items
furnish('div.web-to-plex-prompt-options', {},
furnish('div.web-to-plex-prompt-option', { innerHTML: `${ i? `<a href="https://imdb.com/title/${i}/?ref=web_to_plex" ${s}>${i}</a>`: '/' } \u2014 ${ t? `<a href="https://themoviedb.org/${type=='show'?'tv':type}/${t}" ${s}>${t}</a>`: '/' } \u2014 ${ v? `<a href="https://thetvdb.com/series/${title.replace(/\s+/g,'-').replace(/&/g,'and').replace(/[^\w\-]+/g,'')}#${v}" ${s}>${v}</a>`: '/' }` }),
furnish('div.web-to-plex-prompt-option', { innerHTML: `${ type } \u2014 ${ i? `<a href="https://imdb.com/title/${i}/?ref=web_to_plex" ${s}>${i}</a>`: '/' } \u2014 ${ t? `<a href="https://themoviedb.org/${type=='show'?'tv':type}/${t}" ${s}>${t}</a>`: '/' } \u2014 ${ v? `<a href="https://thetvdb.com/series/${title.replace(/\s+/g,'-').replace(/&/g,'and').replace(/[^\w\-]+/g,'')}#${v}" ${s}>${v}</a>`: '/' }` }),
(
__CONFIG__.PromptQuality?
P_QUA = furnish('select.quality', { onchange: event => options.quality = event.target.value }, ...profiles[type].map(Q => furnish('option', { value: Q.id }, Q.name))):
Expand Down

0 comments on commit 35e26b0

Please sign in to comment.