Merge branch 'erikdesjardins-remove-imgrush'

.eslintrc

@@ -15,7 +15,6 @@
 		"Pasteurizer": false,
 		"SnuOwnd": false,
 		"Konami": false,
-		"Imgrush": false,
 		"MediaPlayer": false,
 		"gfyObject": false,
 

Chrome/manifest.json

@@ -39,7 +39,6 @@
 				"core/template.js",
 				"vendor/konami.js",
 				"vendor/hogan-3.0.2.js",
-				"vendor/imgrush.js",
 				"vendor/gfycat.js",
 				"vendor/gifyoutube.js",
 				"vendor/imgurgifv.js",
@@ -126,7 +125,6 @@
 				"modules/hosts/tumblr.js",
 				"modules/hosts/memecrunch.js",
 				"modules/hosts/imgflip.js",
-				"modules/hosts/imgrush.js",
 				"modules/hosts/livememe.js",
 				"modules/hosts/makeameme.js",
 				"modules/hosts/memegen.js",
@@ -149,7 +147,6 @@
 			],
 			"css": [
 				"css/res.css",
-				"vendor/players.css",
 				"vendor/guiders.css",
 				"vendor/tokenize.css"
 			],

Firefox/index.js

@@ -162,7 +162,6 @@ pageMod.PageMod({
 		self.data.url('core/storage.js'),
 		self.data.url('core/template.js'),
 		self.data.url('vendor/konami.js'),
-		self.data.url('vendor/imgrush.js'),
 		self.data.url('vendor/gfycat.js'),
 		self.data.url('vendor/gifyoutube.js'),
 		self.data.url('vendor/imgurgifv.js'),
@@ -250,7 +249,6 @@ pageMod.PageMod({
 		self.data.url('modules/hosts/tumblr.js'),
 		self.data.url('modules/hosts/memecrunch.js'),
 		self.data.url('modules/hosts/imgflip.js'),
-		self.data.url('modules/hosts/imgrush.js'),
 		self.data.url('modules/hosts/livememe.js'),
 		self.data.url('modules/hosts/makeameme.js'),
 		self.data.url('modules/hosts/memegen.js'),
@@ -273,7 +271,6 @@ pageMod.PageMod({
 	],
 	contentStyleFile: [
 		self.data.url('css/res.css'),
-		self.data.url('vendor/players.css'),
 		self.data.url('vendor/guiders.css'),
 		self.data.url('vendor/tokenize.css')
 	],

Safari/Info.plist

@@ -49,7 +49,6 @@
 				<string>core/storage.js</string>
 				<string>core/template.js</string>
 				<string>vendor/konami.js</string>
-				<string>vendor/imgrush.js</string>
 				<string>vendor/gfycat.js</string>
 				<string>vendor/gifyoutube.js</string>
 				<string>vendor/imgurgifv.js</string>
@@ -136,7 +135,6 @@
 				<string>modules/hosts/tumblr.js</string>
 				<string>modules/hosts/memecrunch.js</string>
 				<string>modules/hosts/imgflip.js</string>
-				<string>modules/hosts/imgrush.js</string>
 				<string>modules/hosts/livememe.js</string>
 				<string>modules/hosts/makeameme.js</string>
 				<string>modules/hosts/memegen.js</string>

Safari/browsersupport-safari.js

@@ -164,7 +164,7 @@ RESEnvironment.storageSetup = function(thisJSON) {
 		};
 
 		// include CSS files, then load scripts.
-		var cssFiles = ['css/res.css', 'vendor/guiders.css', 'vendor/tokenize.css', 'vendor/players.css'];
+		var cssFiles = ['css/res.css', 'vendor/guiders.css', 'vendor/tokenize.css'];
 		for (var i in cssFiles) {
 			loadCSS(cssFiles[i]);
 		}

changelog.txt

@@ -3,7 +3,6 @@ changelog v4.6.0
 - New Features and Enhancements
 
 	- New Modules
-		- Added "Upload" module. Allows file uploading directly from the /submit page  - Currently only supports imgrush.com - If you are interested in adding upload support for your site, please [check the RES GitHub wiki.](https://github.com/honestbleeps/Reddit-Enhancement-Suite/wiki/Adding-new-media-hosts) (thanks @SirCmpwn, @andytuba, @erikdesjardins, and @imgrush)
 		- Added "Orangered" module, for managing and syncing unread notifications (locally). Does not replace reddit message notifiers. (thanks @andytuba)
 		- Added dropdown menu to envelope (notification) button linking to various parts of inbox (thanks @andytuba)
 		- Added global spoiler tag module. Currently only works on user profiles. Any markdown pointing to /spoiler, #spoiler, /s or #s will be hidden. Hovering shows the text (thanks @SirCmpwn and @andytuba)
@@ -117,6 +116,7 @@ changelog v4.6.0
 	- Update jQuery and guiders.js (thanks @mc10)
 	- Update favico.js (thanks @benwa)
 	- Refactored showImages.js - All hosts now have their own file, allowing for easier fixing and creation of expando supporting hosts. (thanks @andytuba @erikdesjardins and more)
+	- Remove MediaCrush host (now defunct)
 	- Factor out Twitter support from the core files (thanks @andytuba and @erikdesjardins)
 	- Greatly refactored KeyboardNav (thanks @andytuba)
 	- Some RES added elements (such as keyboardNav numbers and usertags) will no longer get copied when you select text (thanks @arresteddevelopment)

lib/css/res.scss

@@ -1610,18 +1610,6 @@ div.imgCaptions,
 	margin-left: 8px;
 }
 
-.imgrush-album .imgrush-brand {
-	position: relative;
-	top: -5px;
-	left: 10px;
-}
-
-.imgrush-brand img {
-	position: relative;
-	margin-right: 3px;
-	top: 3px;
-}
-
 #alert_message {
 	display: none;
 	opacity: 0;
@@ -2092,8 +2080,3 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 .imgurgifv-download {
 	float: right;
 }
-
-.md.imgrush-md {
-	background: transparent;
-	border: none !important;
-}

lib/modules/hosts/hosts.json

@@ -1,3 +1,3 @@
 {
-	"hosts": [ "imgrush" ]
+	"hosts": []
 }

lib/modules/showImages.js

@@ -1983,7 +1983,7 @@ addModule('showImages', function(module, moduleID) {
 		'default': {
 			domains: [],
 			acceptRegex: /^[^#]+?\.(gif|jpe?g|png)(?:[?&#_].*|$)/i,
-			rejectRegex: /(?:wikipedia\.org\/wiki|(?:i\.|m\.)?imgur\.com|photobucket\.com|gifsound\.com|imgrush\.com|gfycat\.com|\/wiki\/File:.*|reddit\.com|onedrive\.live\.com|500px\.(?:com|net|org)|(?:www\.|share\.)?gifyoutube\.com)|futurism\.co/i,
+			rejectRegex: /(?:wikipedia\.org\/wiki|(?:i\.|m\.)?imgur\.com|photobucket\.com|gifsound\.com|gfycat\.com|\/wiki\/File:.*|reddit\.com|onedrive\.live\.com|500px\.(?:com|net|org)|(?:www\.|share\.)?gifyoutube\.com)|futurism\.co/i,
 			detect: function(href, elem) {
 				var siteMod = module.siteModules['default'];
 				return (siteMod.acceptRegex.test(href) && !siteMod.rejectRegex.test(href));

lib/modules/upload.js

@@ -1,12 +1,13 @@
+/*
 addModule('uploader', function(module, moduleID) {
 	module.moduleName = 'Submit Page Uploader';
 	module.category = ['Submissions'];
 	module.description = 'Lets you upload files from the submit page.';
 	module.options = {
 		preferredHost: {
 			type: 'enum',
-			value: 'imgrush', // There are no other hosts at the moment, so the default is just Imgrush
-			values: [ /* loadDynamicOptions */ ],
+			value: 'DEFAULT_HOST_HERE',
+			values: [], // loadDynamicOptions
 			description: 'Choose the website you wish to host your files on. Do you own a hosting site you want to add?\
 				<a href="https://github.com/honestbleeps/Reddit-Enhancement-Suite/wiki/Adding-new-media-hosts">Read here</a> for information on how to get yours added.'
 		}
@@ -101,3 +102,4 @@ addModule('uploader', function(module, moduleID) {
 		host.load(url);
 	};
 });
+*/