Merge pull request #14636 from Wikia/XW-4584

XW-4584 | Video does not disappear on edit.

extensions/wikia/AdEngine/.babelrc

@@ -2,8 +2,9 @@
     "presets": [
         ["env", {
             "targets": {
-                "browsers": ["last 2 versions"]
-            }
+                "browsers": ["last 2 versions", "safari >= 9.0"]
+            },
+            "modules": false
         }]
     ],
     "plugins": [

extensions/wikia/AdEngine/.npmrc

@@ -1,3 +1,3 @@
 loglevel="warn"
 save-exact=true
-registry=https://artifactory.wikia-inc.com/artifactory/api/npm/wikia-npm/
+@wikia:registry=https://artifactory.wikia-inc.com/artifactory/api/npm/wikia-npm/

extensions/wikia/AdEngine/js/context/adContext.js

@@ -237,7 +237,7 @@ define('ext.wikia.adEngine.adContext', [
 		return nextElement;
 	}
 
-	setContext(w.ads ? w.ads.context : {});
+	setContext((w.ads && w.ads.context) ? w.ads.context : {});
 
 	return {
 		get: get,

extensions/wikia/AdEngine/package.json

@@ -22,8 +22,8 @@
     "watch": "webpack -p -w"
   },
   "dependencies": {
-    "@wikia/ad-engine": "^9.1.0",
-    "@wikia/ad-products": "3.1.0",
+    "@wikia/ad-engine": "9.2.1",
+    "@wikia/ad-products": "3.3.3",
     "core-decorators": "^0.20.0",
     "lodash": "^4.17.4"
   }

extensions/wikia/AdEngine/src/ad-engine.bridge.js

@@ -22,7 +22,8 @@ import slotConfig from './slots';
 import './ad-engine.bridge.scss';
 
 context.extend(config);
-let supportedTemplates = [BigFancyAdAbove, BigFancyAdBelow];
+
+const supportedTemplates = [BigFancyAdAbove, BigFancyAdBelow];
 
 function init(
 	adTracker,

extensions/wikia/AdEngine/webpack.config.js

@@ -1,38 +1,52 @@
 const path = require('path');
+const webpack = require('webpack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
-module.exports = {
-	context: __dirname,
-	entry: {
-		'bridge': './src/ad-engine.bridge.js',
-	},
-	output: {
-		path: path.resolve(__dirname, 'js/build'),
-		filename: '[name].js',
-		libraryTarget: 'amd',
-		library: 'ext.wikia.adEngine.bridge'
-	},
-	module: {
-		rules: [
-			{
-				test: /\.jsx?$/,
-				include: path.resolve(__dirname, 'src'),
-				use: 'babel-loader',
-			},
-			{
-				test: /\.s?css$/,
-				include: path.resolve(__dirname, 'src'),
-				loader: ExtractTextPlugin.extract({
-					fallback: 'style-loader',
-					use: [
-						'css-loader',
-						'sass-loader'
-					]
-				})
-			}
+const compact = (collection) => Array.from(collection).filter(v => v != null);
+
+module.exports = function (env) {
+	const hoistDependencies = env && env['hoist-dependencies'];
+
+	return {
+		context: __dirname,
+		entry: {
+			'bridge': './src/ad-engine.bridge.js',
+		},
+		output: {
+			path: path.resolve(__dirname, 'js/build'),
+			filename: '[name].js',
+			libraryTarget: 'amd',
+			library: 'ext.wikia.adEngine.bridge'
+		},
+		module: {
+			rules: [
+				{
+					test: /\.jsx?$/,
+					include: path.resolve(__dirname, 'src'),
+					use: 'babel-loader',
+				},
+				{
+					test: /\.s?css$/,
+					include: path.resolve(__dirname, 'src'),
+					loader: ExtractTextPlugin.extract({
+						fallback: 'style-loader',
+						use: [
+							'css-loader',
+							'sass-loader'
+						]
+					})
+				}
+			]
+		},
+		resolve: {
+			modules: compact([
+				hoistDependencies ? path.resolve(__dirname, 'node_modules') : null,
+				'node_modules'
+			])
+		},
+		plugins: [
+			new ExtractTextPlugin({filename: '[name].scss'}),
+			new webpack.optimize.ModuleConcatenationPlugin()
 		]
-	},
-	plugins: [
-		new ExtractTextPlugin({filename: '[name].scss'})
-	]
+	};
 };

extensions/wikia/RTE/js/plugins/media/plugin.js

@@ -536,6 +536,10 @@ RTE.mediaEditor = {
 			var editor = RTE.getInstance(),
 				newMedia = $(html).children('img');
 
+			if (!newMedia.exists()) {
+				newMedia = $(html, editor.document.$);
+			}
+
 			// replace old one with new one
 			newMedia.insertAfter(media);
 			newMedia.setData('wikitext', wikitext);