Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 31383)
+++ Gruntfile.js	(working copy)
@@ -235,6 +235,18 @@
 					'!twenty{fourteen,fifteen}/js/html5.js'
 				]
 			},
+			media: {
+				options: {
+					browserify: true
+				},
+				expand: true,
+				cwd: SOURCE_DIR,
+				src: [
+					'wp-includes/js/media/**/*.js',
+					'!wp-includes/js/media/*.js',
+					'wp-includes/js/media/*.manifest.js'
+				]
+			},
 			core: {
 				expand: true,
 				cwd: SOURCE_DIR,
@@ -507,7 +519,13 @@
 	grunt.registerTask('colors', ['sass:colors', 'autoprefixer:colors']);
 
 	// JSHint task.
-	grunt.registerTask('jshint:corejs', ['jshint:grunt', 'jshint:tests', 'jshint:themes', 'jshint:core']);
+	grunt.registerTask( 'jshint:corejs', [
+		'jshint:grunt',
+		'jshint:tests',
+		'jshint:themes',
+		'jshint:core',
+		'jshint:media'
+	] );
 
 	// Pre-commit task.
 	grunt.registerTask('precommit', 'Runs front-end dev/test tasks in preparation for a commit.',
Index: src/wp-includes/js/media/audio-video.js
===================================================================
--- src/wp-includes/js/media/audio-video.js	(revision 31383)
+++ src/wp-includes/js/media/audio-video.js	(working copy)
@@ -1,5 +1,5 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/* global wp, _wpMediaViewsL10n, _wpmejsSettings, MediaElementPlayer */
+/* global _wpMediaViewsL10n, _wpmejsSettings */
 
 (function(_) {
 	var media = wp.media,
@@ -133,7 +133,7 @@
 			var content;
 
 			_.each( this.defaults, function( value, key ) {
-				model[ key ] = self.coerce( model, key );
+				model[ key ] = this.coerce( model, key );
 
 				if ( value === model[ key ] ) {
 					delete model[ key ];
@@ -223,9 +223,8 @@
 	media.view.VideoDetails = require( './views/video-details.js' );
 
 }(_));
-},{"./controllers/audio-details.js":2,"./controllers/video-details.js":8,"./models/post-media.js":9,"./views/audio-details.js":21,"./views/frame/audio-details.js":25,"./views/frame/media-details.js":26,"./views/frame/video-details.js":28,"./views/media-details.js":31,"./views/video-details.js":50}],2:[function(require,module,exports){
-/*globals wp */
 
+},{"./controllers/audio-details.js":2,"./controllers/video-details.js":8,"./models/post-media.js":9,"./views/audio-details.js":21,"./views/frame/audio-details.js":25,"./views/frame/media-details.js":26,"./views/frame/video-details.js":28,"./views/media-details.js":31,"./views/video-details.js":50}],2:[function(require,module,exports){
 /**
  * The controller for the Audio Details state
  *
@@ -255,8 +254,9 @@
 });
 
 module.exports = AudioDetails;
+
 },{"./state.js":7}],3:[function(require,module,exports){
-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
+/* globals getUserSetting, setUserSetting */
 
 /**
  * wp.media.controller.Library
@@ -329,7 +329,7 @@
 			this.set( 'library', wp.media.query() );
 		}
 
-		if ( ! (selection instanceof Selection) ) {
+		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
 			props = selection;
 
 			if ( ! props ) {
@@ -528,9 +528,8 @@
 _.extend( Library.prototype, selectionSync );
 
 module.exports = Library;
-},{"../utils/selection-sync.js":10,"./state.js":7}],4:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../utils/selection-sync.js":10,"./state.js":7}],4:[function(require,module,exports){
 /**
  * wp.media.controller.MediaLibrary
  *
@@ -579,9 +578,8 @@
 });
 
 module.exports = MediaLibrary;
-},{"./library.js":3}],5:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./library.js":3}],5:[function(require,module,exports){
 /**
  * wp.media.controller.Region
  *
@@ -759,9 +757,8 @@
 });
 
 module.exports = Region;
-},{}],6:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{}],6:[function(require,module,exports){
 /**
  * wp.media.controller.StateMachine
  *
@@ -884,9 +881,8 @@
 });
 
 module.exports = StateMachine;
-},{}],7:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{}],7:[function(require,module,exports){
 /**
  * wp.media.controller.State
  *
@@ -1126,9 +1122,8 @@
 });
 
 module.exports = State;
-},{}],8:[function(require,module,exports){
-/*globals wp */
 
+},{}],8:[function(require,module,exports){
 /**
  * The controller for the Video Details state
  *
@@ -1158,9 +1153,8 @@
 });
 
 module.exports = VideoDetails;
-},{"./state.js":7}],9:[function(require,module,exports){
-/*globals Backbone, _, wp */
 
+},{"./state.js":7}],9:[function(require,module,exports){
 /**
  * Shared model class for audio and video. Updates the model after
  *   "Add Audio|Video Source" and "Replace Audio|Video" states return
@@ -1199,9 +1193,8 @@
 });
 
 module.exports = PostMedia;
-},{}],10:[function(require,module,exports){
-/*globals _ */
 
+},{}],10:[function(require,module,exports){
 /**
  * wp.media.selectionSync
  *
@@ -1266,9 +1259,8 @@
 };
 
 module.exports = selectionSync;
-},{}],11:[function(require,module,exports){
-/*globals _ */
 
+},{}],11:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentCompat
  *
@@ -1352,9 +1344,8 @@
 });
 
 module.exports = AttachmentCompat;
-},{"./view.js":51}],12:[function(require,module,exports){
-/*globals _, jQuery */
 
+},{"./view.js":51}],12:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters
  *
@@ -1431,9 +1422,8 @@
 });
 
 module.exports = AttachmentFilters;
-},{"./view.js":51}],13:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":51}],13:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.All
  *
@@ -1523,9 +1513,8 @@
 });
 
 module.exports = All;
-},{"../attachment-filters.js":12}],14:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../attachment-filters.js":12}],14:[function(require,module,exports){
 /**
  * A filter dropdown for month/dates.
  *
@@ -1566,9 +1555,8 @@
 });
 
 module.exports = DateFilter;
-},{"../attachment-filters.js":12}],15:[function(require,module,exports){
-/*globals wp */
 
+},{"../attachment-filters.js":12}],15:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.Uploaded
  *
@@ -1627,9 +1615,8 @@
 });
 
 module.exports = Uploaded;
-},{"../attachment-filters.js":12}],16:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment-filters.js":12}],16:[function(require,module,exports){
 /**
  * wp.media.view.Attachment
  *
@@ -2182,9 +2169,8 @@
 });
 
 module.exports = Attachment;
-},{"./view.js":51}],17:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":51}],17:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Details
  *
@@ -2244,7 +2230,7 @@
 	deleteAttachment: function( event ) {
 		event.preventDefault();
 
-		if ( confirm( l10n.warnDelete ) ) {
+		if ( window.confirm( l10n.warnDelete ) ) {
 			this.model.destroy();
 			// Keep focus inside media modal
 			// after image is deleted
@@ -2323,6 +2309,7 @@
 });
 
 module.exports = Details;
+
 },{"../attachment.js":16}],18:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Library
@@ -2343,9 +2330,8 @@
 });
 
 module.exports = Library;
-},{"../attachment.js":16}],19:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment.js":16}],19:[function(require,module,exports){
 /**
  * wp.media.view.Attachments
  *
@@ -2618,7 +2604,7 @@
 
 		// The scroll event occurs on the document, but the element
 		// that should be checked is the document body.
-		if ( el == document ) {
+		if ( el === document ) {
 			el = document.body;
 			scrollTop = $(document).scrollTop();
 		}
@@ -2644,9 +2630,8 @@
 });
 
 module.exports = Attachments;
-},{"./attachment.js":16,"./view.js":51}],20:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./attachment.js":16,"./view.js":51}],20:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentsBrowser
  *
@@ -2837,13 +2822,13 @@
 						return;
 					}
 
-					if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
+					if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
 						return;
 					}
 
 					if ( mediaTrash &&
 						'trash' !== selection.at( 0 ).get( 'status' ) &&
-						! confirm( l10n.warnBulkTrash ) ) {
+						! window.confirm( l10n.warnBulkTrash ) ) {
 
 						return;
 					}
@@ -2891,7 +2876,7 @@
 					click: function() {
 						var removed = [], selection = this.controller.state().get( 'selection' );
 
-						if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
+						if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
 							return;
 						}
 
@@ -3104,9 +3089,8 @@
 });
 
 module.exports = AttachmentsBrowser;
-},{"../attachment-compat.js":11,"../attachment-filters/all.js":13,"../attachment-filters/date.js":14,"../attachment-filters/uploaded.js":15,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":30,"../search.js":39,"../settings/attachment-display.js":41,"../sidebar.js":42,"../spinner.js":43,"../toolbar.js":44,"../uploader/inline.js":46,"../uploader/status.js":48,"../view.js":51}],21:[function(require,module,exports){
-/*globals wp */
 
+},{"../attachment-compat.js":11,"../attachment-filters/all.js":13,"../attachment-filters/date.js":14,"../attachment-filters/uploaded.js":15,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":30,"../search.js":39,"../settings/attachment-display.js":41,"../sidebar.js":42,"../spinner.js":43,"../toolbar.js":44,"../uploader/inline.js":46,"../uploader/status.js":48,"../view.js":51}],21:[function(require,module,exports){
 /**
  * wp.media.view.AudioDetails
  *
@@ -3143,9 +3127,8 @@
 });
 
 module.exports = AudioDetails;
-},{"./media-details":31}],22:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./media-details":31}],22:[function(require,module,exports){
 /**
  * wp.media.view.Button
  *
@@ -3233,6 +3216,7 @@
 });
 
 module.exports = Button;
+
 },{"./view.js":51}],23:[function(require,module,exports){
 /**
  * wp.media.view.FocusManager
@@ -3281,9 +3265,8 @@
 });
 
 module.exports = FocusManager;
-},{"./view.js":51}],24:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./view.js":51}],24:[function(require,module,exports){
 /**
  * wp.media.view.Frame
  *
@@ -3454,9 +3437,8 @@
 _.extend( Frame.prototype, StateMachine.prototype );
 
 module.exports = Frame;
-},{"../controllers/region.js":5,"../controllers/state-machine.js":6,"../controllers/state.js":7,"./view.js":51}],25:[function(require,module,exports){
-/*globals wp */
 
+},{"../controllers/region.js":5,"../controllers/state-machine.js":6,"../controllers/state.js":7,"./view.js":51}],25:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.AudioDetails
  *
@@ -3532,9 +3514,8 @@
 });
 
 module.exports = AudioDetails;
-},{"../../controllers/audio-details.js":2,"../../controllers/media-library.js":4,"../audio-details.js":21,"./media-details":26}],26:[function(require,module,exports){
-/*globals wp */
 
+},{"../../controllers/audio-details.js":2,"../../controllers/media-library.js":4,"../audio-details.js":21,"./media-details":26}],26:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.MediaDetails
  *
@@ -3665,9 +3646,8 @@
 });
 
 module.exports = MediaDetails;
-},{"../toolbar.js":44,"../view.js":51,"./select.js":27}],27:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../toolbar.js":44,"../view.js":51,"./select.js":27}],27:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Select
  *
@@ -3840,9 +3820,8 @@
 });
 
 module.exports = Select;
-},{"../../controllers/library.js":3,"../attachments/browser.js":20,"../media-frame.js":32,"../toolbar/select.js":45,"../uploader/inline.js":46}],28:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../../controllers/library.js":3,"../attachments/browser.js":20,"../media-frame.js":32,"../toolbar/select.js":45,"../uploader/inline.js":46}],28:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.VideoDetails
  *
@@ -3978,6 +3957,7 @@
 });
 
 module.exports = VideoDetails;
+
 },{"../../controllers/media-library.js":4,"../../controllers/video-details.js":8,"../video-details.js":50,"./media-details":26}],29:[function(require,module,exports){
 /**
  * wp.media.view.Iframe
@@ -4004,6 +3984,7 @@
 });
 
 module.exports = Iframe;
+
 },{"./view.js":51}],30:[function(require,module,exports){
 /**
  * @class
@@ -4030,9 +4011,8 @@
 });
 
 module.exports = Label;
-},{"./view.js":51}],31:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./view.js":51}],31:[function(require,module,exports){
 /**
  * wp.media.view.MediaDetails
  *
@@ -4116,7 +4096,7 @@
 	 */
 	setPlayer : function() {
 		if ( ! this.players.length && this.media ) {
-			this.players.push( new MediaElementPlayer( this.media, this.settings ) );
+			this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
 		}
 	},
 
@@ -4144,7 +4124,7 @@
 	 */
 	render: function() {
 		AttachmentDisplay.prototype.render.apply( this, arguments );
-		
+
 		setTimeout( _.bind( function() {
 			this.resetFocus();
 		}, this ), 10 );
@@ -4183,9 +4163,8 @@
 });
 
 module.exports = MediaDetails;
-},{"./settings/attachment-display.js":41}],32:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./settings/attachment-display.js":41}],32:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame
  *
@@ -4438,9 +4417,8 @@
 });
 
 module.exports = MediaFrame;
-},{"./frame.js":24,"./iframe.js":29,"./menu.js":34,"./modal.js":35,"./router.js":38,"./toolbar.js":44,"./uploader/window.js":49,"./view.js":51}],33:[function(require,module,exports){
-/*globals wp, jQuery */
 
+},{"./frame.js":24,"./iframe.js":29,"./menu.js":34,"./modal.js":35,"./router.js":38,"./toolbar.js":44,"./uploader/window.js":49,"./view.js":51}],33:[function(require,module,exports){
 /**
  * wp.media.view.MenuItem
  *
@@ -4512,6 +4490,7 @@
 });
 
 module.exports = MenuItem;
+
 },{"./view.js":51}],34:[function(require,module,exports){
 /**
  * wp.media.view.Menu
@@ -4628,9 +4607,8 @@
 });
 
 module.exports = Menu;
-},{"./menu-item.js":33,"./priority-list.js":36}],35:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./menu-item.js":33,"./priority-list.js":36}],35:[function(require,module,exports){
 /**
  * wp.media.view.Modal
  *
@@ -4844,9 +4822,8 @@
 });
 
 module.exports = Modal;
-},{"./focus-manager.js":23,"./view.js":51}],36:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./focus-manager.js":23,"./view.js":51}],36:[function(require,module,exports){
 /**
  * wp.media.view.PriorityList
  *
@@ -4945,6 +4922,7 @@
 });
 
 module.exports = PriorityList;
+
 },{"./view.js":51}],37:[function(require,module,exports){
 /**
  * wp.media.view.RouterItem
@@ -4971,6 +4949,7 @@
 });
 
 module.exports = RouterItem;
+
 },{"./menu-item.js":33}],38:[function(require,module,exports){
 /**
  * wp.media.view.Router
@@ -5008,9 +4987,8 @@
 });
 
 module.exports = Router;
-},{"./menu.js":34,"./router-item.js":37}],39:[function(require,module,exports){
-/*globals wp */
 
+},{"./menu.js":34,"./router-item.js":37}],39:[function(require,module,exports){
 /**
  * wp.media.view.Search
  *
@@ -5058,9 +5036,8 @@
 });
 
 module.exports = Search;
-},{"./view.js":51}],40:[function(require,module,exports){
-/*globals _, Backbone, jQuery */
 
+},{"./view.js":51}],40:[function(require,module,exports){
 /**
  * wp.media.view.Settings
  *
@@ -5168,7 +5145,7 @@
 		// If the setting has a corresponding user setting,
 		// update that as well.
 		if ( userSetting = $setting.data('userSetting') ) {
-			setUserSetting( userSetting, value );
+			window.setUserSetting( userSetting, value );
 		}
 	},
 
@@ -5180,9 +5157,8 @@
 });
 
 module.exports = Settings;
-},{"./view.js":51}],41:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":51}],41:[function(require,module,exports){
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -5275,6 +5251,7 @@
 });
 
 module.exports = AttachmentDisplay;
+
 },{"../settings.js":40}],42:[function(require,module,exports){
 /**
  * wp.media.view.Sidebar
@@ -5293,9 +5270,8 @@
 });
 
 module.exports = Sidebar;
-},{"./priority-list.js":36}],43:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./priority-list.js":36}],43:[function(require,module,exports){
 /**
  * wp.media.view.Spinner
  *
@@ -5332,9 +5308,8 @@
 });
 
 module.exports = Spinner;
-},{"./view.js":51}],44:[function(require,module,exports){
-/*globals Backbone, _ */
 
+},{"./view.js":51}],44:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar
  *
@@ -5495,9 +5470,8 @@
 });
 
 module.exports = Toolbar;
-},{"./button.js":22,"./priority-list.js":36,"./view.js":51}],45:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./button.js":22,"./priority-list.js":36,"./view.js":51}],45:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar.Select
  *
@@ -5566,9 +5540,8 @@
 });
 
 module.exports = Select;
-},{"../toolbar.js":44}],46:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../toolbar.js":44}],46:[function(require,module,exports){
 /**
  * wp.media.view.UploaderInline
  *
@@ -5699,9 +5672,8 @@
 });
 
 module.exports = UploaderInline;
-},{"../view.js":51,"./status.js":48}],47:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":51,"./status.js":48}],47:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatusError
  *
@@ -5719,9 +5691,8 @@
 });
 
 module.exports = UploaderStatusError;
-},{"../view.js":51}],48:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../view.js":51}],48:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatus
  *
@@ -5859,9 +5830,8 @@
 });
 
 module.exports = UploaderStatus;
-},{"../view.js":51,"./status-error.js":47}],49:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../view.js":51,"./status-error.js":47}],49:[function(require,module,exports){
 /**
  * wp.media.view.UploaderWindow
  *
@@ -5972,9 +5942,8 @@
 });
 
 module.exports = UploaderWindow;
-},{"../view.js":51}],50:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":51}],50:[function(require,module,exports){
 /**
  * wp.media.view.VideoDetails
  *
@@ -6016,9 +5985,8 @@
 });
 
 module.exports = VideoDetails;
-},{"./media-details":31}],51:[function(require,module,exports){
-/*globals wp */
 
+},{"./media-details":31}],51:[function(require,module,exports){
 /**
  * wp.media.View
  *
@@ -6083,4 +6051,5 @@
 });
 
 module.exports = View;
+
 },{}]},{},[1]);
Index: src/wp-includes/js/media/audio-video.manifest.js
===================================================================
--- src/wp-includes/js/media/audio-video.manifest.js	(revision 31383)
+++ src/wp-includes/js/media/audio-video.manifest.js	(working copy)
@@ -1,4 +1,4 @@
-/* global wp, _wpMediaViewsL10n, _wpmejsSettings, MediaElementPlayer */
+/* global _wpMediaViewsL10n, _wpmejsSettings */
 
 (function(_) {
 	var media = wp.media,
@@ -132,7 +132,7 @@
 			var content;
 
 			_.each( this.defaults, function( value, key ) {
-				model[ key ] = self.coerce( model, key );
+				model[ key ] = this.coerce( model, key );
 
 				if ( value === model[ key ] ) {
 					delete model[ key ];
@@ -221,4 +221,4 @@
 	media.view.AudioDetails = require( './views/audio-details.js' );
 	media.view.VideoDetails = require( './views/video-details.js' );
 
-}(_));
\ No newline at end of file
+}(_));
Index: src/wp-includes/js/media/controllers/audio-details.js
===================================================================
--- src/wp-includes/js/media/controllers/audio-details.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/audio-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * The controller for the Audio Details state
  *
@@ -28,4 +26,4 @@
 	}
 });
 
-module.exports = AudioDetails;
\ No newline at end of file
+module.exports = AudioDetails;
Index: src/wp-includes/js/media/controllers/collection-add.js
===================================================================
--- src/wp-includes/js/media/controllers/collection-add.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/collection-add.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.CollectionAdd
  *
@@ -98,4 +96,4 @@
 	}
 });
 
-module.exports = CollectionAdd;
\ No newline at end of file
+module.exports = CollectionAdd;
Index: src/wp-includes/js/media/controllers/collection-edit.js
===================================================================
--- src/wp-includes/js/media/controllers/collection-edit.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/collection-edit.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp, jQuery, Backbone */
-
 /**
  * wp.media.controller.CollectionEdit
  *
@@ -159,4 +157,4 @@
 	}
 });
 
-module.exports = CollectionEdit;
\ No newline at end of file
+module.exports = CollectionEdit;
Index: src/wp-includes/js/media/controllers/cropper.js
===================================================================
--- src/wp-includes/js/media/controllers/cropper.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/cropper.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, Backbone */
-
 /**
  * wp.media.controller.Cropper
  *
@@ -75,7 +73,7 @@
 
 						this.$el.text(l10n.cropping);
 						this.$el.attr('disabled', true);
-						
+
 						controller.state().doCrop( selection ).done( function( croppedImage ) {
 							controller.trigger('cropped', croppedImage );
 							controller.close();
@@ -116,4 +114,4 @@
 	}
 });
 
-module.exports = Cropper;
\ No newline at end of file
+module.exports = Cropper;
Index: src/wp-includes/js/media/controllers/edit-attachment-metadata.js
===================================================================
--- src/wp-includes/js/media/controllers/edit-attachment-metadata.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/edit-attachment-metadata.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.controller.EditAttachmentMetadata
  *
@@ -26,4 +24,4 @@
 	}
 });
 
-module.exports = EditAttachmentMetadata;
\ No newline at end of file
+module.exports = EditAttachmentMetadata;
Index: src/wp-includes/js/media/controllers/edit-image.js
===================================================================
--- src/wp-includes/js/media/controllers/edit-image.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/edit-image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.EditImage
  *
@@ -75,4 +73,4 @@
 	}
 });
 
-module.exports = EditImage;
\ No newline at end of file
+module.exports = EditImage;
Index: src/wp-includes/js/media/controllers/embed.js
===================================================================
--- src/wp-includes/js/media/controllers/embed.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/embed.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery, Backbone */
-
 /**
  * wp.media.controller.Embed
  *
@@ -134,4 +132,4 @@
 	}
 });
 
-module.exports = Embed;
\ No newline at end of file
+module.exports = Embed;
Index: src/wp-includes/js/media/controllers/featured-image.js
===================================================================
--- src/wp-includes/js/media/controllers/featured-image.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/featured-image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.FeaturedImage
  *
@@ -119,4 +117,4 @@
 	}
 });
 
-module.exports = FeaturedImage;
\ No newline at end of file
+module.exports = FeaturedImage;
Index: src/wp-includes/js/media/controllers/gallery-add.js
===================================================================
--- src/wp-includes/js/media/controllers/gallery-add.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/gallery-add.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * A state for selecting more images to add to a gallery.
  *
@@ -51,8 +49,9 @@
 	 */
 	initialize: function() {
 		// If a library wasn't supplied, create a library of images.
-		if ( ! this.get('library') )
+		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query({ type: 'image' }) );
+		}
 
 		Library.prototype.initialize.apply( this, arguments );
 	},
@@ -64,8 +63,9 @@
 		var library = this.get('library'),
 			edit    = this.frame.state('gallery-edit').get('library');
 
-		if ( this.editLibrary && this.editLibrary !== edit )
+		if ( this.editLibrary && this.editLibrary !== edit ) {
 			library.unobserve( this.editLibrary );
+		}
 
 		// Accepts attachments that exist in the original library and
 		// that do not exist in gallery's library.
@@ -84,4 +84,4 @@
 	}
 });
 
-module.exports = GalleryAdd;
\ No newline at end of file
+module.exports = GalleryAdd;
Index: src/wp-includes/js/media/controllers/gallery-edit.js
===================================================================
--- src/wp-includes/js/media/controllers/gallery-edit.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/gallery-edit.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp, Backbone */
-
 /**
  * wp.media.controller.GalleryEdit
  *
@@ -61,12 +59,15 @@
 	 */
 	initialize: function() {
 		// If we haven't been provided a `library`, create a `Selection`.
-		if ( ! this.get('library') )
+		if ( ! this.get('library') ) {
 			this.set( 'library', new wp.media.model.Selection() );
+		}
 
 		// The single `Attachment` view to be used in the `Attachments` view.
-		if ( ! this.get('AttachmentView') )
+		if ( ! this.get('AttachmentView') ) {
 			this.set( 'AttachmentView', EditLibraryView );
+		}
+
 		Library.prototype.initialize.apply( this, arguments );
 	},
 
@@ -136,4 +137,4 @@
 	}
 });
 
-module.exports = GalleryEdit;
\ No newline at end of file
+module.exports = GalleryEdit;
Index: src/wp-includes/js/media/controllers/image-details.js
===================================================================
--- src/wp-includes/js/media/controllers/image-details.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/image-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.ImageDetails
  *
@@ -59,4 +57,4 @@
 	}
 });
 
-module.exports = ImageDetails;
\ No newline at end of file
+module.exports = ImageDetails;
Index: src/wp-includes/js/media/controllers/library.js
===================================================================
--- src/wp-includes/js/media/controllers/library.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/library.js	(working copy)
@@ -1,4 +1,4 @@
-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
+/* globals getUserSetting, setUserSetting */
 
 /**
  * wp.media.controller.Library
@@ -71,7 +71,7 @@
 			this.set( 'library', wp.media.query() );
 		}
 
-		if ( ! (selection instanceof Selection) ) {
+		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
 			props = selection;
 
 			if ( ! props ) {
@@ -269,4 +269,4 @@
 // Make selectionSync available on any Media Library state.
 _.extend( Library.prototype, selectionSync );
 
-module.exports = Library;
\ No newline at end of file
+module.exports = Library;
Index: src/wp-includes/js/media/controllers/media-library.js
===================================================================
--- src/wp-includes/js/media/controllers/media-library.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/media-library.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.MediaLibrary
  *
@@ -47,4 +45,4 @@
 	}
 });
 
-module.exports = MediaLibrary;
\ No newline at end of file
+module.exports = MediaLibrary;
Index: src/wp-includes/js/media/controllers/region.js
===================================================================
--- src/wp-includes/js/media/controllers/region.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/region.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.controller.Region
  *
@@ -176,4 +174,4 @@
 	}
 });
 
-module.exports = Region;
\ No newline at end of file
+module.exports = Region;
Index: src/wp-includes/js/media/controllers/replace-image.js
===================================================================
--- src/wp-includes/js/media/controllers/replace-image.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/replace-image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.controller.ReplaceImage
  *
@@ -105,4 +103,4 @@
 	}
 });
 
-module.exports = ReplaceImage;
\ No newline at end of file
+module.exports = ReplaceImage;
Index: src/wp-includes/js/media/controllers/state-machine.js
===================================================================
--- src/wp-includes/js/media/controllers/state-machine.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/state-machine.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.controller.StateMachine
  *
@@ -121,4 +119,4 @@
 	};
 });
 
-module.exports = StateMachine;
\ No newline at end of file
+module.exports = StateMachine;
Index: src/wp-includes/js/media/controllers/state.js
===================================================================
--- src/wp-includes/js/media/controllers/state.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/state.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.controller.State
  *
@@ -238,4 +236,4 @@
 	};
 });
 
-module.exports = State;
\ No newline at end of file
+module.exports = State;
Index: src/wp-includes/js/media/controllers/video-details.js
===================================================================
--- src/wp-includes/js/media/controllers/video-details.js	(revision 31383)
+++ src/wp-includes/js/media/controllers/video-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * The controller for the Video Details state
  *
@@ -28,4 +26,4 @@
 	}
 });
 
-module.exports = VideoDetails;
\ No newline at end of file
+module.exports = VideoDetails;
Index: src/wp-includes/js/media/grid.js
===================================================================
--- src/wp-includes/js/media/grid.js	(revision 31383)
+++ src/wp-includes/js/media/grid.js	(working copy)
@@ -1,6 +1,4 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/*globals wp */
-
 /**
  * wp.media.controller.EditAttachmentMetadata
  *
@@ -28,9 +26,8 @@
 });
 
 module.exports = EditAttachmentMetadata;
-},{"./state.js":6}],2:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./state.js":6}],2:[function(require,module,exports){
 /**
  * wp.media.controller.EditImage
  *
@@ -107,8 +104,9 @@
 });
 
 module.exports = EditImage;
+
 },{"../views/toolbar.js":46,"./state.js":6}],3:[function(require,module,exports){
-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
+/* globals getUserSetting, setUserSetting */
 
 /**
  * wp.media.controller.Library
@@ -181,7 +179,7 @@
 			this.set( 'library', wp.media.query() );
 		}
 
-		if ( ! (selection instanceof Selection) ) {
+		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
 			props = selection;
 
 			if ( ! props ) {
@@ -380,9 +378,8 @@
 _.extend( Library.prototype, selectionSync );
 
 module.exports = Library;
-},{"../utils/selection-sync.js":9,"./state.js":6}],4:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"../utils/selection-sync.js":9,"./state.js":6}],4:[function(require,module,exports){
 /**
  * wp.media.controller.Region
  *
@@ -560,9 +557,8 @@
 });
 
 module.exports = Region;
-},{}],5:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{}],5:[function(require,module,exports){
 /**
  * wp.media.controller.StateMachine
  *
@@ -685,9 +681,8 @@
 });
 
 module.exports = StateMachine;
-},{}],6:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{}],6:[function(require,module,exports){
 /**
  * wp.media.controller.State
  *
@@ -927,8 +922,8 @@
 });
 
 module.exports = State;
+
 },{}],7:[function(require,module,exports){
-/* global wp, _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
 (function (wp) {
 	var media = wp.media;
 
@@ -943,9 +938,8 @@
 	media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
 
 }(wp));
-},{"./controllers/edit-attachment-metadata.js":1,"./routers/manage.js":8,"./views/attachment/details-two-column.js":16,"./views/button/delete-selected-permanently.js":22,"./views/button/delete-selected.js":23,"./views/button/select-mode-toggle.js":24,"./views/edit-image-details.js":25,"./views/frame/edit-attachments.js":29,"./views/frame/manage.js":30}],8:[function(require,module,exports){
-/*globals jQuery, Backbone */
 
+},{"./controllers/edit-attachment-metadata.js":1,"./routers/manage.js":8,"./views/attachment/details-two-column.js":16,"./views/button/delete-selected-permanently.js":22,"./views/button/delete-selected.js":23,"./views/button/select-mode-toggle.js":24,"./views/edit-image-details.js":25,"./views/frame/edit-attachments.js":29,"./views/frame/manage.js":30}],8:[function(require,module,exports){
 /**
  * A router for handling the browser history and application state.
  *
@@ -990,9 +984,8 @@
 });
 
 module.exports = Router;
-},{}],9:[function(require,module,exports){
-/*globals _ */
 
+},{}],9:[function(require,module,exports){
 /**
  * wp.media.selectionSync
  *
@@ -1057,9 +1050,8 @@
 };
 
 module.exports = selectionSync;
-},{}],10:[function(require,module,exports){
-/*globals _ */
 
+},{}],10:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentCompat
  *
@@ -1143,9 +1135,8 @@
 });
 
 module.exports = AttachmentCompat;
-},{"./view.js":51}],11:[function(require,module,exports){
-/*globals _, jQuery */
 
+},{"./view.js":51}],11:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters
  *
@@ -1222,9 +1213,8 @@
 });
 
 module.exports = AttachmentFilters;
-},{"./view.js":51}],12:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":51}],12:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.All
  *
@@ -1314,9 +1304,8 @@
 });
 
 module.exports = All;
-},{"../attachment-filters.js":11}],13:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../attachment-filters.js":11}],13:[function(require,module,exports){
 /**
  * A filter dropdown for month/dates.
  *
@@ -1357,9 +1346,8 @@
 });
 
 module.exports = DateFilter;
-},{"../attachment-filters.js":11}],14:[function(require,module,exports){
-/*globals wp */
 
+},{"../attachment-filters.js":11}],14:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.Uploaded
  *
@@ -1418,9 +1406,8 @@
 });
 
 module.exports = Uploaded;
-},{"../attachment-filters.js":11}],15:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment-filters.js":11}],15:[function(require,module,exports){
 /**
  * wp.media.view.Attachment
  *
@@ -1973,9 +1960,8 @@
 });
 
 module.exports = Attachment;
-},{"./view.js":51}],16:[function(require,module,exports){
-/*globals wp */
 
+},{"./view.js":51}],16:[function(require,module,exports){
 /**
  * A similar view to media.view.Attachment.Details
  * for use in the Edit Attachment modal.
@@ -2010,15 +1996,14 @@
 		wp.media.mixin.removeAllPlayers();
 		this.$( 'audio, video' ).each( function (i, elem) {
 			var el = MediaDetails.prepareSrc( elem );
-			new MediaElementPlayer( el, wp.media.mixin.mejsSettings );
+			new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
 		} );
 	}
 });
 
 module.exports = TwoColumn;
-},{"../media-details.js":33,"./details.js":17}],17:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../media-details.js":33,"./details.js":17}],17:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Details
  *
@@ -2078,7 +2063,7 @@
 	deleteAttachment: function( event ) {
 		event.preventDefault();
 
-		if ( confirm( l10n.warnDelete ) ) {
+		if ( window.confirm( l10n.warnDelete ) ) {
 			this.model.destroy();
 			// Keep focus inside media modal
 			// after image is deleted
@@ -2157,6 +2142,7 @@
 });
 
 module.exports = Details;
+
 },{"../attachment.js":15}],18:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Library
@@ -2177,9 +2163,8 @@
 });
 
 module.exports = Library;
-},{"../attachment.js":15}],19:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment.js":15}],19:[function(require,module,exports){
 /**
  * wp.media.view.Attachments
  *
@@ -2452,7 +2437,7 @@
 
 		// The scroll event occurs on the document, but the element
 		// that should be checked is the document body.
-		if ( el == document ) {
+		if ( el === document ) {
 			el = document.body;
 			scrollTop = $(document).scrollTop();
 		}
@@ -2478,9 +2463,8 @@
 });
 
 module.exports = Attachments;
-},{"./attachment.js":15,"./view.js":51}],20:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./attachment.js":15,"./view.js":51}],20:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentsBrowser
  *
@@ -2671,13 +2655,13 @@
 						return;
 					}
 
-					if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
+					if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
 						return;
 					}
 
 					if ( mediaTrash &&
 						'trash' !== selection.at( 0 ).get( 'status' ) &&
-						! confirm( l10n.warnBulkTrash ) ) {
+						! window.confirm( l10n.warnBulkTrash ) ) {
 
 						return;
 					}
@@ -2725,7 +2709,7 @@
 					click: function() {
 						var removed = [], selection = this.controller.state().get( 'selection' );
 
-						if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
+						if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
 							return;
 						}
 
@@ -2938,9 +2922,8 @@
 });
 
 module.exports = AttachmentsBrowser;
-},{"../attachment-compat.js":10,"../attachment-filters/all.js":12,"../attachment-filters/date.js":13,"../attachment-filters/uploaded.js":14,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":32,"../search.js":41,"../settings/attachment-display.js":43,"../sidebar.js":44,"../spinner.js":45,"../toolbar.js":46,"../uploader/inline.js":47,"../uploader/status.js":49,"../view.js":51}],21:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"../attachment-compat.js":10,"../attachment-filters/all.js":12,"../attachment-filters/date.js":13,"../attachment-filters/uploaded.js":14,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":32,"../search.js":41,"../settings/attachment-display.js":43,"../sidebar.js":44,"../spinner.js":45,"../toolbar.js":46,"../uploader/inline.js":47,"../uploader/status.js":49,"../view.js":51}],21:[function(require,module,exports){
 /**
  * wp.media.view.Button
  *
@@ -3028,6 +3011,7 @@
 });
 
 module.exports = Button;
+
 },{"./view.js":51}],22:[function(require,module,exports){
 /**
  * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic
@@ -3072,9 +3056,8 @@
 });
 
 module.exports = DeleteSelectedPermanently;
-},{"../button.js":21,"./delete-selected.js":23}],23:[function(require,module,exports){
-/*globals wp */
 
+},{"../button.js":21,"./delete-selected.js":23}],23:[function(require,module,exports){
 /**
  * A button that handles bulk Delete/Trash logic
  *
@@ -3124,9 +3107,8 @@
 });
 
 module.exports = DeleteSelected;
-},{"../button.js":21}],24:[function(require,module,exports){
-/*globals wp */
 
+},{"../button.js":21}],24:[function(require,module,exports){
 var Button = require( '../button.js' ),
 	l10n = wp.media.view.l10n,
 	SelectModeToggle;
@@ -3180,6 +3162,7 @@
 });
 
 module.exports = SelectModeToggle;
+
 },{"../button.js":21}],25:[function(require,module,exports){
 var View = require( './view.js' ),
 	EditImage = require( './edit-image.js' ),
@@ -3205,9 +3188,8 @@
 });
 
 module.exports = Details;
-},{"./edit-image.js":26,"./view.js":51}],26:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./edit-image.js":26,"./view.js":51}],26:[function(require,module,exports){
 var View = require( './view.js' ),
 	EditImage;
 
@@ -3259,6 +3241,7 @@
 });
 
 module.exports = EditImage;
+
 },{"./view.js":51}],27:[function(require,module,exports){
 /**
  * wp.media.view.FocusManager
@@ -3307,9 +3290,8 @@
 });
 
 module.exports = FocusManager;
-},{"./view.js":51}],28:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./view.js":51}],28:[function(require,module,exports){
 /**
  * wp.media.view.Frame
  *
@@ -3480,9 +3462,8 @@
 _.extend( Frame.prototype, StateMachine.prototype );
 
 module.exports = Frame;
-},{"../controllers/region.js":4,"../controllers/state-machine.js":5,"../controllers/state.js":6,"./view.js":51}],29:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../controllers/region.js":4,"../controllers/state-machine.js":5,"../controllers/state.js":6,"./view.js":51}],29:[function(require,module,exports){
 /**
  * A frame for editing the details of a specific media item.
  *
@@ -3727,9 +3708,8 @@
 });
 
 module.exports = EditAttachments;
-},{"../../controllers/edit-attachment-metadata.js":1,"../../controllers/edit-image.js":2,"../attachment-compat.js":10,"../attachment/details-two-column.js":16,"../edit-image-details.js":25,"../frame.js":28,"../media-frame.js":34,"../modal.js":37}],30:[function(require,module,exports){
-/*globals _, Backbone, wp, jQuery */
 
+},{"../../controllers/edit-attachment-metadata.js":1,"../../controllers/edit-image.js":2,"../attachment-compat.js":10,"../attachment/details-two-column.js":16,"../edit-image-details.js":25,"../frame.js":28,"../media-frame.js":34,"../modal.js":37}],30:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Manage
  *
@@ -3967,7 +3947,7 @@
 		// Verify pushState support and activate
 		if ( window.history && window.history.pushState ) {
 			Backbone.history.start( {
-				root: _wpMediaGridSettings.adminUrl,
+				root: window._wpMediaGridSettings.adminUrl,
 				pushState: true
 			} );
 		}
@@ -3975,6 +3955,7 @@
 });
 
 module.exports = Manage;
+
 },{"../../controllers/library.js":3,"../../routers/manage.js":8,"../attachments/browser.js":20,"../media-frame.js":34,"../uploader/window.js":50}],31:[function(require,module,exports){
 /**
  * wp.media.view.Iframe
@@ -4001,6 +3982,7 @@
 });
 
 module.exports = Iframe;
+
 },{"./view.js":51}],32:[function(require,module,exports){
 /**
  * @class
@@ -4027,9 +4009,8 @@
 });
 
 module.exports = Label;
-},{"./view.js":51}],33:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./view.js":51}],33:[function(require,module,exports){
 /**
  * wp.media.view.MediaDetails
  *
@@ -4113,7 +4094,7 @@
 	 */
 	setPlayer : function() {
 		if ( ! this.players.length && this.media ) {
-			this.players.push( new MediaElementPlayer( this.media, this.settings ) );
+			this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
 		}
 	},
 
@@ -4141,7 +4122,7 @@
 	 */
 	render: function() {
 		AttachmentDisplay.prototype.render.apply( this, arguments );
-		
+
 		setTimeout( _.bind( function() {
 			this.resetFocus();
 		}, this ), 10 );
@@ -4180,9 +4161,8 @@
 });
 
 module.exports = MediaDetails;
-},{"./settings/attachment-display.js":43}],34:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./settings/attachment-display.js":43}],34:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame
  *
@@ -4435,9 +4415,8 @@
 });
 
 module.exports = MediaFrame;
-},{"./frame.js":28,"./iframe.js":31,"./menu.js":36,"./modal.js":37,"./router.js":40,"./toolbar.js":46,"./uploader/window.js":50,"./view.js":51}],35:[function(require,module,exports){
-/*globals wp, jQuery */
 
+},{"./frame.js":28,"./iframe.js":31,"./menu.js":36,"./modal.js":37,"./router.js":40,"./toolbar.js":46,"./uploader/window.js":50,"./view.js":51}],35:[function(require,module,exports){
 /**
  * wp.media.view.MenuItem
  *
@@ -4509,6 +4488,7 @@
 });
 
 module.exports = MenuItem;
+
 },{"./view.js":51}],36:[function(require,module,exports){
 /**
  * wp.media.view.Menu
@@ -4625,9 +4605,8 @@
 });
 
 module.exports = Menu;
-},{"./menu-item.js":35,"./priority-list.js":38}],37:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./menu-item.js":35,"./priority-list.js":38}],37:[function(require,module,exports){
 /**
  * wp.media.view.Modal
  *
@@ -4841,9 +4820,8 @@
 });
 
 module.exports = Modal;
-},{"./focus-manager.js":27,"./view.js":51}],38:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./focus-manager.js":27,"./view.js":51}],38:[function(require,module,exports){
 /**
  * wp.media.view.PriorityList
  *
@@ -4942,6 +4920,7 @@
 });
 
 module.exports = PriorityList;
+
 },{"./view.js":51}],39:[function(require,module,exports){
 /**
  * wp.media.view.RouterItem
@@ -4968,6 +4947,7 @@
 });
 
 module.exports = RouterItem;
+
 },{"./menu-item.js":35}],40:[function(require,module,exports){
 /**
  * wp.media.view.Router
@@ -5005,9 +4985,8 @@
 });
 
 module.exports = Router;
-},{"./menu.js":36,"./router-item.js":39}],41:[function(require,module,exports){
-/*globals wp */
 
+},{"./menu.js":36,"./router-item.js":39}],41:[function(require,module,exports){
 /**
  * wp.media.view.Search
  *
@@ -5055,9 +5034,8 @@
 });
 
 module.exports = Search;
-},{"./view.js":51}],42:[function(require,module,exports){
-/*globals _, Backbone, jQuery */
 
+},{"./view.js":51}],42:[function(require,module,exports){
 /**
  * wp.media.view.Settings
  *
@@ -5165,7 +5143,7 @@
 		// If the setting has a corresponding user setting,
 		// update that as well.
 		if ( userSetting = $setting.data('userSetting') ) {
-			setUserSetting( userSetting, value );
+			window.setUserSetting( userSetting, value );
 		}
 	},
 
@@ -5177,9 +5155,8 @@
 });
 
 module.exports = Settings;
-},{"./view.js":51}],43:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":51}],43:[function(require,module,exports){
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -5272,6 +5249,7 @@
 });
 
 module.exports = AttachmentDisplay;
+
 },{"../settings.js":42}],44:[function(require,module,exports){
 /**
  * wp.media.view.Sidebar
@@ -5290,9 +5268,8 @@
 });
 
 module.exports = Sidebar;
-},{"./priority-list.js":38}],45:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./priority-list.js":38}],45:[function(require,module,exports){
 /**
  * wp.media.view.Spinner
  *
@@ -5329,9 +5306,8 @@
 });
 
 module.exports = Spinner;
-},{"./view.js":51}],46:[function(require,module,exports){
-/*globals Backbone, _ */
 
+},{"./view.js":51}],46:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar
  *
@@ -5492,9 +5468,8 @@
 });
 
 module.exports = Toolbar;
-},{"./button.js":21,"./priority-list.js":38,"./view.js":51}],47:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./button.js":21,"./priority-list.js":38,"./view.js":51}],47:[function(require,module,exports){
 /**
  * wp.media.view.UploaderInline
  *
@@ -5625,9 +5600,8 @@
 });
 
 module.exports = UploaderInline;
-},{"../view.js":51,"./status.js":49}],48:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":51,"./status.js":49}],48:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatusError
  *
@@ -5645,9 +5619,8 @@
 });
 
 module.exports = UploaderStatusError;
-},{"../view.js":51}],49:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../view.js":51}],49:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatus
  *
@@ -5785,9 +5758,8 @@
 });
 
 module.exports = UploaderStatus;
-},{"../view.js":51,"./status-error.js":48}],50:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../view.js":51,"./status-error.js":48}],50:[function(require,module,exports){
 /**
  * wp.media.view.UploaderWindow
  *
@@ -5898,9 +5870,8 @@
 });
 
 module.exports = UploaderWindow;
-},{"../view.js":51}],51:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":51}],51:[function(require,module,exports){
 /**
  * wp.media.View
  *
@@ -5965,4 +5936,5 @@
 });
 
 module.exports = View;
+
 },{}]},{},[7]);
Index: src/wp-includes/js/media/grid.manifest.js
===================================================================
--- src/wp-includes/js/media/grid.manifest.js	(revision 31383)
+++ src/wp-includes/js/media/grid.manifest.js	(working copy)
@@ -1,4 +1,3 @@
-/* global wp, _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
 (function (wp) {
 	var media = wp.media;
 
@@ -12,4 +11,4 @@
 	media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
 	media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
 
-}(wp));
\ No newline at end of file
+}(wp));
Index: src/wp-includes/js/media/models/attachment.js
===================================================================
--- src/wp-includes/js/media/models/attachment.js	(revision 31383)
+++ src/wp-includes/js/media/models/attachment.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals jQuery, Backbone, _, wp */
-
 /**
  * wp.media.model.Attachment
  *
@@ -128,7 +126,7 @@
 			return $.Deferred().rejectWith( this ).promise();
 		}
 
-		return media.post( 'save-attachment-compat', _.defaults({
+		return wp.media.post( 'save-attachment-compat', _.defaults({
 			id:      this.id,
 			nonce:   this.get('nonces').update,
 			post_id: wp.media.model.settings.post.id
@@ -165,4 +163,4 @@
 	})
 });
 
-module.exports = Attachment;
\ No newline at end of file
+module.exports = Attachment;
Index: src/wp-includes/js/media/models/attachments.js
===================================================================
--- src/wp-includes/js/media/models/attachments.js	(revision 31383)
+++ src/wp-includes/js/media/models/attachments.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals jQuery, Backbone, _, wp */
-
 /**
  * wp.media.model.Attachments
  *
@@ -323,8 +321,9 @@
 		// checking if we're still mirroring that collection when
 		// the request resolves.
 		mirroring.more( options ).done( function() {
-			if ( this === attachments.mirroring )
+			if ( this === attachments.mirroring ) {
 				deferred.resolveWith( this );
+			}
 		});
 
 		return deferred.promise();
@@ -532,4 +531,4 @@
 	}
 });
 
-module.exports = Attachments;
\ No newline at end of file
+module.exports = Attachments;
Index: src/wp-includes/js/media/models/post-image.js
===================================================================
--- src/wp-includes/js/media/models/post-image.js	(revision 31383)
+++ src/wp-includes/js/media/models/post-image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals jQuery, Backbone */
-
 /**
  * wp.media.model.PostImage
  *
@@ -153,4 +151,4 @@
 	}
 });
 
-module.exports = PostImage;
\ No newline at end of file
+module.exports = PostImage;
Index: src/wp-includes/js/media/models/post-media.js
===================================================================
--- src/wp-includes/js/media/models/post-media.js	(revision 31383)
+++ src/wp-includes/js/media/models/post-media.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals Backbone, _, wp */
-
 /**
  * Shared model class for audio and video. Updates the model after
  *   "Add Audio|Video Source" and "Replace Audio|Video" states return
@@ -37,4 +35,4 @@
 	}
 });
 
-module.exports = PostMedia;
\ No newline at end of file
+module.exports = PostMedia;
Index: src/wp-includes/js/media/models/query.js
===================================================================
--- src/wp-includes/js/media/models/query.js	(revision 31383)
+++ src/wp-includes/js/media/models/query.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals jQuery, _, wp */
-
 /**
  * wp.media.model.Query
  *
@@ -305,4 +303,4 @@
 	}())
 });
 
-module.exports = Query;
\ No newline at end of file
+module.exports = Query;
Index: src/wp-includes/js/media/models/selection.js
===================================================================
--- src/wp-includes/js/media/models/selection.js	(revision 31383)
+++ src/wp-includes/js/media/models/selection.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _ */
-
 /**
  * wp.media.model.Selection
  *
@@ -94,4 +92,4 @@
 	}
 });
 
-module.exports = Selection;
\ No newline at end of file
+module.exports = Selection;
Index: src/wp-includes/js/media/models.js
===================================================================
--- src/wp-includes/js/media/models.js	(revision 31383)
+++ src/wp-includes/js/media/models.js	(working copy)
@@ -231,9 +231,8 @@
 	});
 
 }(jQuery));
-},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
-/*globals jQuery, Backbone, _, wp */
 
+},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
 /**
  * wp.media.model.Attachment
  *
@@ -362,7 +361,7 @@
 			return $.Deferred().rejectWith( this ).promise();
 		}
 
-		return media.post( 'save-attachment-compat', _.defaults({
+		return wp.media.post( 'save-attachment-compat', _.defaults({
 			id:      this.id,
 			nonce:   this.get('nonces').update,
 			post_id: wp.media.model.settings.post.id
@@ -400,9 +399,8 @@
 });
 
 module.exports = Attachment;
-},{"./attachments.js":3}],3:[function(require,module,exports){
-/*globals jQuery, Backbone, _, wp */
 
+},{"./attachments.js":3}],3:[function(require,module,exports){
 /**
  * wp.media.model.Attachments
  *
@@ -726,8 +724,9 @@
 		// checking if we're still mirroring that collection when
 		// the request resolves.
 		mirroring.more( options ).done( function() {
-			if ( this === attachments.mirroring )
+			if ( this === attachments.mirroring ) {
 				deferred.resolveWith( this );
+			}
 		});
 
 		return deferred.promise();
@@ -936,9 +935,8 @@
 });
 
 module.exports = Attachments;
-},{"./attachment.js":2,"./query.js":5}],4:[function(require,module,exports){
-/*globals jQuery, Backbone */
 
+},{"./attachment.js":2,"./query.js":5}],4:[function(require,module,exports){
 /**
  * wp.media.model.PostImage
  *
@@ -1093,9 +1091,8 @@
 });
 
 module.exports = PostImage;
-},{"./attachment":2}],5:[function(require,module,exports){
-/*globals jQuery, _, wp */
 
+},{"./attachment":2}],5:[function(require,module,exports){
 /**
  * wp.media.model.Query
  *
@@ -1402,9 +1399,8 @@
 });
 
 module.exports = Query;
-},{"./attachments.js":3}],6:[function(require,module,exports){
-/*globals _ */
 
+},{"./attachments.js":3}],6:[function(require,module,exports){
 /**
  * wp.media.model.Selection
  *
@@ -1500,4 +1496,5 @@
 });
 
 module.exports = Selection;
+
 },{"./attachments.js":3}]},{},[1]);
Index: src/wp-includes/js/media/models.manifest.js
===================================================================
--- src/wp-includes/js/media/models.manifest.js	(revision 31383)
+++ src/wp-includes/js/media/models.manifest.js	(working copy)
@@ -229,4 +229,4 @@
 		window.wp = null;
 	});
 
-}(jQuery));
\ No newline at end of file
+}(jQuery));
Index: src/wp-includes/js/media/routers/manage.js
===================================================================
--- src/wp-includes/js/media/routers/manage.js	(revision 31383)
+++ src/wp-includes/js/media/routers/manage.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals jQuery, Backbone */
-
 /**
  * A router for handling the browser history and application state.
  *
@@ -43,4 +41,4 @@
 	}
 });
 
-module.exports = Router;
\ No newline at end of file
+module.exports = Router;
Index: src/wp-includes/js/media/utils/selection-sync.js
===================================================================
--- src/wp-includes/js/media/utils/selection-sync.js	(revision 31383)
+++ src/wp-includes/js/media/utils/selection-sync.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _ */
-
 /**
  * wp.media.selectionSync
  *
@@ -63,4 +61,4 @@
 	}
 };
 
-module.exports = selectionSync;
\ No newline at end of file
+module.exports = selectionSync;
Index: src/wp-includes/js/media/views/attachment/details-two-column.js
===================================================================
--- src/wp-includes/js/media/views/attachment/details-two-column.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/details-two-column.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * A similar view to media.view.Attachment.Details
  * for use in the Edit Attachment modal.
@@ -34,9 +32,9 @@
 		wp.media.mixin.removeAllPlayers();
 		this.$( 'audio, video' ).each( function (i, elem) {
 			var el = MediaDetails.prepareSrc( elem );
-			new MediaElementPlayer( el, wp.media.mixin.mejsSettings );
+			new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
 		} );
 	}
 });
 
-module.exports = TwoColumn;
\ No newline at end of file
+module.exports = TwoColumn;
Index: src/wp-includes/js/media/views/attachment/details.js
===================================================================
--- src/wp-includes/js/media/views/attachment/details.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.Attachment.Details
  *
@@ -59,7 +57,7 @@
 	deleteAttachment: function( event ) {
 		event.preventDefault();
 
-		if ( confirm( l10n.warnDelete ) ) {
+		if ( window.confirm( l10n.warnDelete ) ) {
 			this.model.destroy();
 			// Keep focus inside media modal
 			// after image is deleted
@@ -137,4 +135,4 @@
 	}
 });
 
-module.exports = Details;
\ No newline at end of file
+module.exports = Details;
Index: src/wp-includes/js/media/views/attachment/edit-library.js
===================================================================
--- src/wp-includes/js/media/views/attachment/edit-library.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/edit-library.js	(working copy)
@@ -16,4 +16,4 @@
 	}
 });
 
-module.exports = EditLibrary;
\ No newline at end of file
+module.exports = EditLibrary;
Index: src/wp-includes/js/media/views/attachment/edit-selection.js
===================================================================
--- src/wp-includes/js/media/views/attachment/edit-selection.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/edit-selection.js	(working copy)
@@ -17,4 +17,4 @@
 	}
 });
 
-module.exports = EditSelection;
\ No newline at end of file
+module.exports = EditSelection;
Index: src/wp-includes/js/media/views/attachment/library.js
===================================================================
--- src/wp-includes/js/media/views/attachment/library.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/library.js	(working copy)
@@ -16,4 +16,4 @@
 	}
 });
 
-module.exports = Library;
\ No newline at end of file
+module.exports = Library;
Index: src/wp-includes/js/media/views/attachment/selection.js
===================================================================
--- src/wp-includes/js/media/views/attachment/selection.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment/selection.js	(working copy)
@@ -20,4 +20,4 @@
 	}
 });
 
-module.exports = Selection;
\ No newline at end of file
+module.exports = Selection;
Index: src/wp-includes/js/media/views/attachment-compat.js
===================================================================
--- src/wp-includes/js/media/views/attachment-compat.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment-compat.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _ */
-
 /**
  * wp.media.view.AttachmentCompat
  *
@@ -82,4 +80,4 @@
 	}
 });
 
-module.exports = AttachmentCompat;
\ No newline at end of file
+module.exports = AttachmentCompat;
Index: src/wp-includes/js/media/views/attachment-filters/all.js
===================================================================
--- src/wp-includes/js/media/views/attachment-filters/all.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment-filters/all.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.AttachmentFilters.All
  *
@@ -88,4 +86,4 @@
 	}
 });
 
-module.exports = All;
\ No newline at end of file
+module.exports = All;
Index: src/wp-includes/js/media/views/attachment-filters/date.js
===================================================================
--- src/wp-includes/js/media/views/attachment-filters/date.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment-filters/date.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * A filter dropdown for month/dates.
  *
@@ -39,4 +37,4 @@
 	}
 });
 
-module.exports = DateFilter;
\ No newline at end of file
+module.exports = DateFilter;
Index: src/wp-includes/js/media/views/attachment-filters/uploaded.js
===================================================================
--- src/wp-includes/js/media/views/attachment-filters/uploaded.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment-filters/uploaded.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.AttachmentFilters.Uploaded
  *
@@ -57,4 +55,4 @@
 	}
 });
 
-module.exports = Uploaded;
\ No newline at end of file
+module.exports = Uploaded;
Index: src/wp-includes/js/media/views/attachment-filters.js
===================================================================
--- src/wp-includes/js/media/views/attachment-filters.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment-filters.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, jQuery */
-
 /**
  * wp.media.view.AttachmentFilters
  *
@@ -75,4 +73,4 @@
 	}
 });
 
-module.exports = AttachmentFilters;
\ No newline at end of file
+module.exports = AttachmentFilters;
Index: src/wp-includes/js/media/views/attachment.js
===================================================================
--- src/wp-includes/js/media/views/attachment.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachment.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.Attachment
  *
@@ -551,4 +549,4 @@
 	};
 });
 
-module.exports = Attachment;
\ No newline at end of file
+module.exports = Attachment;
Index: src/wp-includes/js/media/views/attachments/browser.js
===================================================================
--- src/wp-includes/js/media/views/attachments/browser.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachments/browser.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.AttachmentsBrowser
  *
@@ -190,13 +188,13 @@
 						return;
 					}
 
-					if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
+					if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
 						return;
 					}
 
 					if ( mediaTrash &&
 						'trash' !== selection.at( 0 ).get( 'status' ) &&
-						! confirm( l10n.warnBulkTrash ) ) {
+						! window.confirm( l10n.warnBulkTrash ) ) {
 
 						return;
 					}
@@ -244,7 +242,7 @@
 					click: function() {
 						var removed = [], selection = this.controller.state().get( 'selection' );
 
-						if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
+						if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
 							return;
 						}
 
@@ -456,4 +454,4 @@
 	}
 });
 
-module.exports = AttachmentsBrowser;
\ No newline at end of file
+module.exports = AttachmentsBrowser;
Index: src/wp-includes/js/media/views/attachments/selection.js
===================================================================
--- src/wp-includes/js/media/views/attachments/selection.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachments/selection.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _ */
-
 /**
  * wp.media.view.Attachments.Selection
  *
@@ -28,4 +26,4 @@
 	}
 });
 
-module.exports = Selection;
\ No newline at end of file
+module.exports = Selection;
Index: src/wp-includes/js/media/views/attachments.js
===================================================================
--- src/wp-includes/js/media/views/attachments.js	(revision 31383)
+++ src/wp-includes/js/media/views/attachments.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.Attachments
  *
@@ -272,7 +270,7 @@
 
 		// The scroll event occurs on the document, but the element
 		// that should be checked is the document body.
-		if ( el == document ) {
+		if ( el === document ) {
 			el = document.body;
 			scrollTop = $(document).scrollTop();
 		}
@@ -297,4 +295,4 @@
 	}
 });
 
-module.exports = Attachments;
\ No newline at end of file
+module.exports = Attachments;
Index: src/wp-includes/js/media/views/audio-details.js
===================================================================
--- src/wp-includes/js/media/views/audio-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/audio-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.AudioDetails
  *
@@ -35,4 +33,4 @@
 	}
 });
 
-module.exports = AudioDetails;
\ No newline at end of file
+module.exports = AudioDetails;
Index: src/wp-includes/js/media/views/button/delete-selected-permanently.js
===================================================================
--- src/wp-includes/js/media/views/button/delete-selected-permanently.js	(revision 31383)
+++ src/wp-includes/js/media/views/button/delete-selected-permanently.js	(working copy)
@@ -40,4 +40,4 @@
 	}
 });
 
-module.exports = DeleteSelectedPermanently;
\ No newline at end of file
+module.exports = DeleteSelectedPermanently;
Index: src/wp-includes/js/media/views/button/delete-selected.js
===================================================================
--- src/wp-includes/js/media/views/button/delete-selected.js	(revision 31383)
+++ src/wp-includes/js/media/views/button/delete-selected.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * A button that handles bulk Delete/Trash logic
  *
@@ -48,4 +46,4 @@
 	}
 });
 
-module.exports = DeleteSelected;
\ No newline at end of file
+module.exports = DeleteSelected;
Index: src/wp-includes/js/media/views/button/select-mode-toggle.js
===================================================================
--- src/wp-includes/js/media/views/button/select-mode-toggle.js	(revision 31383)
+++ src/wp-includes/js/media/views/button/select-mode-toggle.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 var Button = require( '../button.js' ),
 	l10n = wp.media.view.l10n,
 	SelectModeToggle;
@@ -52,4 +50,4 @@
 	}
 });
 
-module.exports = SelectModeToggle;
\ No newline at end of file
+module.exports = SelectModeToggle;
Index: src/wp-includes/js/media/views/button-group.js
===================================================================
--- src/wp-includes/js/media/views/button-group.js	(revision 31383)
+++ src/wp-includes/js/media/views/button-group.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone, jQuery */
-
 /**
  * wp.media.view.ButtonGroup
  *
@@ -45,4 +43,4 @@
 	}
 });
 
-module.exports = ButtonGroup;
\ No newline at end of file
+module.exports = ButtonGroup;
Index: src/wp-includes/js/media/views/button.js
===================================================================
--- src/wp-includes/js/media/views/button.js	(revision 31383)
+++ src/wp-includes/js/media/views/button.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.view.Button
  *
@@ -86,4 +84,4 @@
 	}
 });
 
-module.exports = Button;
\ No newline at end of file
+module.exports = Button;
Index: src/wp-includes/js/media/views/cropper.js
===================================================================
--- src/wp-includes/js/media/views/cropper.js	(revision 31383)
+++ src/wp-includes/js/media/views/cropper.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.Cropper
  *
@@ -60,9 +58,9 @@
 
 		this.views.add( '.upload-errors', new UploaderStatusError({
 			filename: UploaderStatus.prototype.filename(filename),
-			message: _wpMediaViewsL10n.cropError
+			message: window._wpMediaViewsL10n.cropError
 		}), { at: 0 });
 	}
 });
 
-module.exports = Cropper;
\ No newline at end of file
+module.exports = Cropper;
Index: src/wp-includes/js/media/views/edit-image-details.js
===================================================================
--- src/wp-includes/js/media/views/edit-image-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/edit-image-details.js	(working copy)
@@ -21,4 +21,4 @@
 	}
 });
 
-module.exports = Details;
\ No newline at end of file
+module.exports = Details;
Index: src/wp-includes/js/media/views/edit-image.js
===================================================================
--- src/wp-includes/js/media/views/edit-image.js	(revision 31383)
+++ src/wp-includes/js/media/views/edit-image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 var View = require( './view.js' ),
 	EditImage;
 
@@ -50,4 +48,4 @@
 
 });
 
-module.exports = EditImage;
\ No newline at end of file
+module.exports = EditImage;
Index: src/wp-includes/js/media/views/embed/image.js
===================================================================
--- src/wp-includes/js/media/views/embed/image.js	(revision 31383)
+++ src/wp-includes/js/media/views/embed/image.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.EmbedImage
  *
@@ -30,4 +28,4 @@
 	}
 });
 
-module.exports = EmbedImage;
\ No newline at end of file
+module.exports = EmbedImage;
Index: src/wp-includes/js/media/views/embed/link.js
===================================================================
--- src/wp-includes/js/media/views/embed/link.js	(revision 31383)
+++ src/wp-includes/js/media/views/embed/link.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.EmbedLink
  *
@@ -64,4 +62,4 @@
 	}
 });
 
-module.exports = EmbedLink;
\ No newline at end of file
+module.exports = EmbedLink;
Index: src/wp-includes/js/media/views/embed/url.js
===================================================================
--- src/wp-includes/js/media/views/embed/url.js	(revision 31383)
+++ src/wp-includes/js/media/views/embed/url.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.EmbedUrl
  *
@@ -76,4 +74,4 @@
 	}
 });
 
-module.exports = EmbedUrl;
\ No newline at end of file
+module.exports = EmbedUrl;
Index: src/wp-includes/js/media/views/embed.js
===================================================================
--- src/wp-includes/js/media/views/embed.js	(revision 31383)
+++ src/wp-includes/js/media/views/embed.js	(working copy)
@@ -65,4 +65,4 @@
 	}
 });
 
-module.exports = Embed;
\ No newline at end of file
+module.exports = Embed;
Index: src/wp-includes/js/media/views/focus-manager.js
===================================================================
--- src/wp-includes/js/media/views/focus-manager.js	(revision 31383)
+++ src/wp-includes/js/media/views/focus-manager.js	(working copy)
@@ -44,4 +44,4 @@
 
 });
 
-module.exports = FocusManager;
\ No newline at end of file
+module.exports = FocusManager;
Index: src/wp-includes/js/media/views/frame/audio-details.js
===================================================================
--- src/wp-includes/js/media/views/frame/audio-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/audio-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.MediaFrame.AudioDetails
  *
@@ -74,4 +72,4 @@
 	}
 });
 
-module.exports = AudioDetails;
\ No newline at end of file
+module.exports = AudioDetails;
Index: src/wp-includes/js/media/views/frame/edit-attachments.js
===================================================================
--- src/wp-includes/js/media/views/frame/edit-attachments.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/edit-attachments.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * A frame for editing the details of a specific media item.
  *
@@ -243,4 +241,4 @@
 	}
 });
 
-module.exports = EditAttachments;
\ No newline at end of file
+module.exports = EditAttachments;
Index: src/wp-includes/js/media/views/frame/image-details.js
===================================================================
--- src/wp-includes/js/media/views/frame/image-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/image-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.MediaFrame.ImageDetails
  *
@@ -180,4 +178,4 @@
 
 });
 
-module.exports = ImageDetails;
\ No newline at end of file
+module.exports = ImageDetails;
Index: src/wp-includes/js/media/views/frame/manage.js
===================================================================
--- src/wp-includes/js/media/views/frame/manage.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/manage.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone, wp, jQuery */
-
 /**
  * wp.media.view.MediaFrame.Manage
  *
@@ -237,11 +235,11 @@
 		// Verify pushState support and activate
 		if ( window.history && window.history.pushState ) {
 			Backbone.history.start( {
-				root: _wpMediaGridSettings.adminUrl,
+				root: window._wpMediaGridSettings.adminUrl,
 				pushState: true
 			} );
 		}
 	}
 });
 
-module.exports = Manage;
\ No newline at end of file
+module.exports = Manage;
Index: src/wp-includes/js/media/views/frame/media-details.js
===================================================================
--- src/wp-includes/js/media/views/frame/media-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/media-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.MediaFrame.MediaDetails
  *
@@ -129,4 +127,4 @@
 	}
 });
 
-module.exports = MediaDetails;
\ No newline at end of file
+module.exports = MediaDetails;
Index: src/wp-includes/js/media/views/frame/post.js
===================================================================
--- src/wp-includes/js/media/views/frame/post.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/post.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.MediaFrame.Post
  *
@@ -748,4 +746,4 @@
 	}
 });
 
-module.exports = Post;
\ No newline at end of file
+module.exports = Post;
Index: src/wp-includes/js/media/views/frame/select.js
===================================================================
--- src/wp-includes/js/media/views/frame/select.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/select.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.MediaFrame.Select
  *
@@ -171,4 +169,4 @@
 	}
 });
 
-module.exports = Select;
\ No newline at end of file
+module.exports = Select;
Index: src/wp-includes/js/media/views/frame/video-details.js
===================================================================
--- src/wp-includes/js/media/views/frame/video-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame/video-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.MediaFrame.VideoDetails
  *
@@ -134,4 +132,4 @@
 	}
 });
 
-module.exports = VideoDetails;
\ No newline at end of file
+module.exports = VideoDetails;
Index: src/wp-includes/js/media/views/frame.js
===================================================================
--- src/wp-includes/js/media/views/frame.js	(revision 31383)
+++ src/wp-includes/js/media/views/frame.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.view.Frame
  *
@@ -169,4 +167,4 @@
 // Make the `Frame` a `StateMachine`.
 _.extend( Frame.prototype, StateMachine.prototype );
 
-module.exports = Frame;
\ No newline at end of file
+module.exports = Frame;
Index: src/wp-includes/js/media/views/iframe.js
===================================================================
--- src/wp-includes/js/media/views/iframe.js	(revision 31383)
+++ src/wp-includes/js/media/views/iframe.js	(working copy)
@@ -22,4 +22,4 @@
 	}
 });
 
-module.exports = Iframe;
\ No newline at end of file
+module.exports = Iframe;
Index: src/wp-includes/js/media/views/image-details.js
===================================================================
--- src/wp-includes/js/media/views/image-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/image-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.ImageDetails
  *
@@ -73,7 +71,7 @@
 	postRender: function() {
 		setTimeout( _.bind( this.resetFocus, this ), 10 );
 		this.toggleLinkSettings();
-		if ( getUserSetting( 'advImgDetails' ) === 'show' ) {
+		if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
 			this.toggleAdvanced( true );
 		}
 		this.trigger( 'post-render' );
@@ -146,7 +144,7 @@
 			mode = 'show';
 		}
 
-		setUserSetting( 'advImgDetails', mode );
+		window.setUserSetting( 'advImgDetails', mode );
 	},
 
 	editAttachment: function( event ) {
@@ -165,4 +163,4 @@
 	}
 });
 
-module.exports = AttachmentDisplay;
\ No newline at end of file
+module.exports = AttachmentDisplay;
Index: src/wp-includes/js/media/views/label.js
===================================================================
--- src/wp-includes/js/media/views/label.js	(revision 31383)
+++ src/wp-includes/js/media/views/label.js	(working copy)
@@ -22,4 +22,4 @@
 	}
 });
 
-module.exports = Label;
\ No newline at end of file
+module.exports = Label;
Index: src/wp-includes/js/media/views/media-details.js
===================================================================
--- src/wp-includes/js/media/views/media-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/media-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.MediaDetails
  *
@@ -83,7 +81,7 @@
 	 */
 	setPlayer : function() {
 		if ( ! this.players.length && this.media ) {
-			this.players.push( new MediaElementPlayer( this.media, this.settings ) );
+			this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
 		}
 	},
 
@@ -111,7 +109,7 @@
 	 */
 	render: function() {
 		AttachmentDisplay.prototype.render.apply( this, arguments );
-		
+
 		setTimeout( _.bind( function() {
 			this.resetFocus();
 		}, this ), 10 );
@@ -149,4 +147,4 @@
 	}
 });
 
-module.exports = MediaDetails;
\ No newline at end of file
+module.exports = MediaDetails;
Index: src/wp-includes/js/media/views/media-frame.js
===================================================================
--- src/wp-includes/js/media/views/media-frame.js	(revision 31383)
+++ src/wp-includes/js/media/views/media-frame.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.MediaFrame
  *
@@ -251,4 +249,4 @@
 	};
 });
 
-module.exports = MediaFrame;
\ No newline at end of file
+module.exports = MediaFrame;
Index: src/wp-includes/js/media/views/menu-item.js
===================================================================
--- src/wp-includes/js/media/views/menu-item.js	(revision 31383)
+++ src/wp-includes/js/media/views/menu-item.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp, jQuery */
-
 /**
  * wp.media.view.MenuItem
  *
@@ -70,4 +68,4 @@
 	}
 });
 
-module.exports = MenuItem;
\ No newline at end of file
+module.exports = MenuItem;
Index: src/wp-includes/js/media/views/menu.js
===================================================================
--- src/wp-includes/js/media/views/menu.js	(revision 31383)
+++ src/wp-includes/js/media/views/menu.js	(working copy)
@@ -112,4 +112,4 @@
 	}
 });
 
-module.exports = Menu;
\ No newline at end of file
+module.exports = Menu;
Index: src/wp-includes/js/media/views/modal.js
===================================================================
--- src/wp-includes/js/media/views/modal.js	(revision 31383)
+++ src/wp-includes/js/media/views/modal.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.Modal
  *
@@ -212,4 +210,4 @@
 	}
 });
 
-module.exports = Modal;
\ No newline at end of file
+module.exports = Modal;
Index: src/wp-includes/js/media/views/priority-list.js
===================================================================
--- src/wp-includes/js/media/views/priority-list.js	(revision 31383)
+++ src/wp-includes/js/media/views/priority-list.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone */
-
 /**
  * wp.media.view.PriorityList
  *
@@ -97,4 +95,4 @@
 	}
 });
 
-module.exports = PriorityList;
\ No newline at end of file
+module.exports = PriorityList;
Index: src/wp-includes/js/media/views/router-item.js
===================================================================
--- src/wp-includes/js/media/views/router-item.js	(revision 31383)
+++ src/wp-includes/js/media/views/router-item.js	(working copy)
@@ -22,4 +22,4 @@
 	}
 });
 
-module.exports = RouterItem;
\ No newline at end of file
+module.exports = RouterItem;
Index: src/wp-includes/js/media/views/router.js
===================================================================
--- src/wp-includes/js/media/views/router.js	(revision 31383)
+++ src/wp-includes/js/media/views/router.js	(working copy)
@@ -33,4 +33,4 @@
 	}
 });
 
-module.exports = Router;
\ No newline at end of file
+module.exports = Router;
Index: src/wp-includes/js/media/views/search.js
===================================================================
--- src/wp-includes/js/media/views/search.js	(revision 31383)
+++ src/wp-includes/js/media/views/search.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.Search
  *
@@ -46,4 +44,4 @@
 	}
 });
 
-module.exports = Search;
\ No newline at end of file
+module.exports = Search;
Index: src/wp-includes/js/media/views/selection.js
===================================================================
--- src/wp-includes/js/media/views/selection.js	(revision 31383)
+++ src/wp-includes/js/media/views/selection.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone, wp */
-
 /**
  * wp.media.view.Selection
  *
@@ -82,4 +80,4 @@
 	}
 });
 
-module.exports = Selection;
\ No newline at end of file
+module.exports = Selection;
Index: src/wp-includes/js/media/views/settings/attachment-display.js
===================================================================
--- src/wp-includes/js/media/views/settings/attachment-display.js	(revision 31383)
+++ src/wp-includes/js/media/views/settings/attachment-display.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -91,4 +89,4 @@
 	}
 });
 
-module.exports = AttachmentDisplay;
\ No newline at end of file
+module.exports = AttachmentDisplay;
Index: src/wp-includes/js/media/views/settings/gallery.js
===================================================================
--- src/wp-includes/js/media/views/settings/gallery.js	(revision 31383)
+++ src/wp-includes/js/media/views/settings/gallery.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.Settings.Gallery
  *
@@ -17,4 +15,4 @@
 	template:  wp.template('gallery-settings')
 });
 
-module.exports = Gallery;
\ No newline at end of file
+module.exports = Gallery;
Index: src/wp-includes/js/media/views/settings/playlist.js
===================================================================
--- src/wp-includes/js/media/views/settings/playlist.js	(revision 31383)
+++ src/wp-includes/js/media/views/settings/playlist.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.Settings.Playlist
  *
@@ -17,4 +15,4 @@
 	template:  wp.template('playlist-settings')
 });
 
-module.exports = Playlist;
\ No newline at end of file
+module.exports = Playlist;
Index: src/wp-includes/js/media/views/settings.js
===================================================================
--- src/wp-includes/js/media/views/settings.js	(revision 31383)
+++ src/wp-includes/js/media/views/settings.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, Backbone, jQuery */
-
 /**
  * wp.media.view.Settings
  *
@@ -107,7 +105,7 @@
 		// If the setting has a corresponding user setting,
 		// update that as well.
 		if ( userSetting = $setting.data('userSetting') ) {
-			setUserSetting( userSetting, value );
+			window.setUserSetting( userSetting, value );
 		}
 	},
 
@@ -118,4 +116,4 @@
 	}
 });
 
-module.exports = Settings;
\ No newline at end of file
+module.exports = Settings;
Index: src/wp-includes/js/media/views/sidebar.js
===================================================================
--- src/wp-includes/js/media/views/sidebar.js	(revision 31383)
+++ src/wp-includes/js/media/views/sidebar.js	(working copy)
@@ -14,4 +14,4 @@
 	className: 'media-sidebar'
 });
 
-module.exports = Sidebar;
\ No newline at end of file
+module.exports = Sidebar;
Index: src/wp-includes/js/media/views/spinner.js
===================================================================
--- src/wp-includes/js/media/views/spinner.js	(revision 31383)
+++ src/wp-includes/js/media/views/spinner.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.Spinner
  *
@@ -35,4 +33,4 @@
 	}
 });
 
-module.exports = Spinner;
\ No newline at end of file
+module.exports = Spinner;
Index: src/wp-includes/js/media/views/toolbar/embed.js
===================================================================
--- src/wp-includes/js/media/views/toolbar/embed.js	(revision 31383)
+++ src/wp-includes/js/media/views/toolbar/embed.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.Toolbar.Embed
  *
@@ -34,4 +32,4 @@
 	}
 });
 
-module.exports = Embed;
\ No newline at end of file
+module.exports = Embed;
Index: src/wp-includes/js/media/views/toolbar/select.js
===================================================================
--- src/wp-includes/js/media/views/toolbar/select.js	(revision 31383)
+++ src/wp-includes/js/media/views/toolbar/select.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.Toolbar.Select
  *
@@ -67,4 +65,4 @@
 	}
 });
 
-module.exports = Select;
\ No newline at end of file
+module.exports = Select;
Index: src/wp-includes/js/media/views/toolbar.js
===================================================================
--- src/wp-includes/js/media/views/toolbar.js	(revision 31383)
+++ src/wp-includes/js/media/views/toolbar.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals Backbone, _ */
-
 /**
  * wp.media.view.Toolbar
  *
@@ -159,4 +157,4 @@
 	}
 });
 
-module.exports = Toolbar;
\ No newline at end of file
+module.exports = Toolbar;
Index: src/wp-includes/js/media/views/uploader/editor.js
===================================================================
--- src/wp-includes/js/media/views/uploader/editor.js	(revision 31383)
+++ src/wp-includes/js/media/views/uploader/editor.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
  * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
@@ -216,4 +214,4 @@
 	}
 });
 
-module.exports = EditorUploader;
\ No newline at end of file
+module.exports = EditorUploader;
Index: src/wp-includes/js/media/views/uploader/inline.js
===================================================================
--- src/wp-includes/js/media/views/uploader/inline.js	(revision 31383)
+++ src/wp-includes/js/media/views/uploader/inline.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.UploaderInline
  *
@@ -129,4 +127,4 @@
 
 });
 
-module.exports = UploaderInline;
\ No newline at end of file
+module.exports = UploaderInline;
Index: src/wp-includes/js/media/views/uploader/status-error.js
===================================================================
--- src/wp-includes/js/media/views/uploader/status-error.js	(revision 31383)
+++ src/wp-includes/js/media/views/uploader/status-error.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.UploaderStatusError
  *
@@ -16,4 +14,4 @@
 	template:  wp.template('uploader-status-error')
 });
 
-module.exports = UploaderStatusError;
\ No newline at end of file
+module.exports = UploaderStatusError;
Index: src/wp-includes/js/media/views/uploader/status.js
===================================================================
--- src/wp-includes/js/media/views/uploader/status.js	(revision 31383)
+++ src/wp-includes/js/media/views/uploader/status.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp */
-
 /**
  * wp.media.view.UploaderStatus
  *
@@ -136,4 +134,4 @@
 	}
 });
 
-module.exports = UploaderStatus;
\ No newline at end of file
+module.exports = UploaderStatus;
Index: src/wp-includes/js/media/views/uploader/window.js
===================================================================
--- src/wp-includes/js/media/views/uploader/window.js	(revision 31383)
+++ src/wp-includes/js/media/views/uploader/window.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals _, wp, jQuery */
-
 /**
  * wp.media.view.UploaderWindow
  *
@@ -109,4 +107,4 @@
 	}
 });
 
-module.exports = UploaderWindow;
\ No newline at end of file
+module.exports = UploaderWindow;
Index: src/wp-includes/js/media/views/video-details.js
===================================================================
--- src/wp-includes/js/media/views/video-details.js	(revision 31383)
+++ src/wp-includes/js/media/views/video-details.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.view.VideoDetails
  *
@@ -40,4 +38,4 @@
 	}
 });
 
-module.exports = VideoDetails;
\ No newline at end of file
+module.exports = VideoDetails;
Index: src/wp-includes/js/media/views/view.js
===================================================================
--- src/wp-includes/js/media/views/view.js	(revision 31383)
+++ src/wp-includes/js/media/views/view.js	(working copy)
@@ -1,5 +1,3 @@
-/*globals wp */
-
 /**
  * wp.media.View
  *
@@ -63,4 +61,4 @@
 	}
 });
 
-module.exports = View;
\ No newline at end of file
+module.exports = View;
Index: src/wp-includes/js/media/views.js
===================================================================
--- src/wp-includes/js/media/views.js	(revision 31383)
+++ src/wp-includes/js/media/views.js	(working copy)
@@ -1,6 +1,4 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/*globals _, wp */
-
 /**
  * wp.media.controller.CollectionAdd
  *
@@ -100,9 +98,8 @@
 });
 
 module.exports = CollectionAdd;
-},{"./library.js":10}],2:[function(require,module,exports){
-/*globals wp, jQuery, Backbone */
 
+},{"./library.js":10}],2:[function(require,module,exports){
 /**
  * wp.media.controller.CollectionEdit
  *
@@ -263,9 +260,8 @@
 });
 
 module.exports = CollectionEdit;
-},{"../views/attachment/edit-library.js":25,"../views/view.js":71,"./library.js":10}],3:[function(require,module,exports){
-/*globals _, wp, Backbone */
 
+},{"../views/attachment/edit-library.js":25,"../views/view.js":71,"./library.js":10}],3:[function(require,module,exports){
 /**
  * wp.media.controller.Cropper
  *
@@ -341,7 +337,7 @@
 
 						this.$el.text(l10n.cropping);
 						this.$el.attr('disabled', true);
-						
+
 						controller.state().doCrop( selection ).done( function( croppedImage ) {
 							controller.trigger('cropped', croppedImage );
 							controller.close();
@@ -383,9 +379,8 @@
 });
 
 module.exports = Cropper;
-},{"../views/cropper.js":34,"../views/toolbar.js":63,"./state.js":15}],4:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../views/cropper.js":34,"../views/toolbar.js":63,"./state.js":15}],4:[function(require,module,exports){
 /**
  * wp.media.controller.EditImage
  *
@@ -462,9 +457,8 @@
 });
 
 module.exports = EditImage;
-},{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
-/*globals _, wp, jQuery, Backbone */
 
+},{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
 /**
  * wp.media.controller.Embed
  *
@@ -600,9 +594,8 @@
 });
 
 module.exports = Embed;
-},{"./state.js":15}],6:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./state.js":15}],6:[function(require,module,exports){
 /**
  * wp.media.controller.FeaturedImage
  *
@@ -723,9 +716,8 @@
 });
 
 module.exports = FeaturedImage;
-},{"./library.js":10}],7:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./library.js":10}],7:[function(require,module,exports){
 /**
  * A state for selecting more images to add to a gallery.
  *
@@ -777,8 +769,9 @@
 	 */
 	initialize: function() {
 		// If a library wasn't supplied, create a library of images.
-		if ( ! this.get('library') )
+		if ( ! this.get('library') ) {
 			this.set( 'library', wp.media.query({ type: 'image' }) );
+		}
 
 		Library.prototype.initialize.apply( this, arguments );
 	},
@@ -790,8 +783,9 @@
 		var library = this.get('library'),
 			edit    = this.frame.state('gallery-edit').get('library');
 
-		if ( this.editLibrary && this.editLibrary !== edit )
+		if ( this.editLibrary && this.editLibrary !== edit ) {
 			library.unobserve( this.editLibrary );
+		}
 
 		// Accepts attachments that exist in the original library and
 		// that do not exist in gallery's library.
@@ -811,9 +805,8 @@
 });
 
 module.exports = GalleryAdd;
-},{"./library.js":10}],8:[function(require,module,exports){
-/*globals wp, Backbone */
 
+},{"./library.js":10}],8:[function(require,module,exports){
 /**
  * wp.media.controller.GalleryEdit
  *
@@ -875,12 +868,15 @@
 	 */
 	initialize: function() {
 		// If we haven't been provided a `library`, create a `Selection`.
-		if ( ! this.get('library') )
+		if ( ! this.get('library') ) {
 			this.set( 'library', new wp.media.model.Selection() );
+		}
 
 		// The single `Attachment` view to be used in the `Attachments` view.
-		if ( ! this.get('AttachmentView') )
+		if ( ! this.get('AttachmentView') ) {
 			this.set( 'AttachmentView', EditLibraryView );
+		}
+
 		Library.prototype.initialize.apply( this, arguments );
 	},
 
@@ -951,9 +947,8 @@
 });
 
 module.exports = GalleryEdit;
-},{"../views/attachment/edit-library.js":25,"../views/settings/gallery.js":59,"./library.js":10}],9:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../views/attachment/edit-library.js":25,"../views/settings/gallery.js":59,"./library.js":10}],9:[function(require,module,exports){
 /**
  * wp.media.controller.ImageDetails
  *
@@ -1014,8 +1009,9 @@
 });
 
 module.exports = ImageDetails;
+
 },{"./library.js":10,"./state.js":15}],10:[function(require,module,exports){
-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
+/* globals getUserSetting, setUserSetting */
 
 /**
  * wp.media.controller.Library
@@ -1088,7 +1084,7 @@
 			this.set( 'library', wp.media.query() );
 		}
 
-		if ( ! (selection instanceof Selection) ) {
+		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
 			props = selection;
 
 			if ( ! props ) {
@@ -1287,9 +1283,8 @@
 _.extend( Library.prototype, selectionSync );
 
 module.exports = Library;
-},{"../utils/selection-sync.js":16,"./state.js":15}],11:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../utils/selection-sync.js":16,"./state.js":15}],11:[function(require,module,exports){
 /**
  * wp.media.controller.MediaLibrary
  *
@@ -1338,9 +1333,8 @@
 });
 
 module.exports = MediaLibrary;
-},{"./library.js":10}],12:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./library.js":10}],12:[function(require,module,exports){
 /**
  * wp.media.controller.Region
  *
@@ -1518,9 +1512,8 @@
 });
 
 module.exports = Region;
-},{}],13:[function(require,module,exports){
-/*globals _, wp */
 
+},{}],13:[function(require,module,exports){
 /**
  * wp.media.controller.ReplaceImage
  *
@@ -1627,9 +1620,8 @@
 });
 
 module.exports = ReplaceImage;
-},{"./library.js":10}],14:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./library.js":10}],14:[function(require,module,exports){
 /**
  * wp.media.controller.StateMachine
  *
@@ -1752,9 +1744,8 @@
 });
 
 module.exports = StateMachine;
-},{}],15:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{}],15:[function(require,module,exports){
 /**
  * wp.media.controller.State
  *
@@ -1994,9 +1985,8 @@
 });
 
 module.exports = State;
-},{}],16:[function(require,module,exports){
-/*globals _ */
 
+},{}],16:[function(require,module,exports){
 /**
  * wp.media.selectionSync
  *
@@ -2061,8 +2051,9 @@
 };
 
 module.exports = selectionSync;
+
 },{}],17:[function(require,module,exports){
-/* global _wpMediaViewsL10n, confirm, getUserSetting, setUserSetting */
+/* global _wpMediaViewsL10n */
 ( function( $, _ ) {
 	var l10n,
 		media = wp.media;
@@ -2211,8 +2202,6 @@
 
 }(jQuery, _));
 },{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/edit-image.js":4,"./controllers/embed.js":5,"./controllers/featured-image.js":6,"./controllers/gallery-add.js":7,"./controllers/gallery-edit.js":8,"./controllers/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,"./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,"./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(require,module,exports){
-/*globals _ */
-
 /**
  * wp.media.view.AttachmentCompat
  *
@@ -2296,9 +2285,8 @@
 });
 
 module.exports = AttachmentCompat;
-},{"./view.js":71}],19:[function(require,module,exports){
-/*globals _, jQuery */
 
+},{"./view.js":71}],19:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters
  *
@@ -2375,9 +2363,8 @@
 });
 
 module.exports = AttachmentFilters;
-},{"./view.js":71}],20:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":71}],20:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.All
  *
@@ -2467,9 +2454,8 @@
 });
 
 module.exports = All;
-},{"../attachment-filters.js":19}],21:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../attachment-filters.js":19}],21:[function(require,module,exports){
 /**
  * A filter dropdown for month/dates.
  *
@@ -2510,9 +2496,8 @@
 });
 
 module.exports = DateFilter;
-},{"../attachment-filters.js":19}],22:[function(require,module,exports){
-/*globals wp */
 
+},{"../attachment-filters.js":19}],22:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentFilters.Uploaded
  *
@@ -2571,9 +2556,8 @@
 });
 
 module.exports = Uploaded;
-},{"../attachment-filters.js":19}],23:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment-filters.js":19}],23:[function(require,module,exports){
 /**
  * wp.media.view.Attachment
  *
@@ -3126,9 +3110,8 @@
 });
 
 module.exports = Attachment;
-},{"./view.js":71}],24:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":71}],24:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Details
  *
@@ -3188,7 +3171,7 @@
 	deleteAttachment: function( event ) {
 		event.preventDefault();
 
-		if ( confirm( l10n.warnDelete ) ) {
+		if ( window.confirm( l10n.warnDelete ) ) {
 			this.model.destroy();
 			// Keep focus inside media modal
 			// after image is deleted
@@ -3267,6 +3250,7 @@
 });
 
 module.exports = Details;
+
 },{"../attachment.js":23}],25:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.EditLibrary
@@ -3287,6 +3271,7 @@
 });
 
 module.exports = EditLibrary;
+
 },{"../attachment.js":23}],26:[function(require,module,exports){
 /**
  * wp.media.view.Attachments.EditSelection
@@ -3308,6 +3293,7 @@
 });
 
 module.exports = EditSelection;
+
 },{"./selection.js":28}],27:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Library
@@ -3328,6 +3314,7 @@
 });
 
 module.exports = Library;
+
 },{"../attachment.js":23}],28:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Selection
@@ -3352,9 +3339,8 @@
 });
 
 module.exports = Selection;
-},{"../attachment.js":23}],29:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../attachment.js":23}],29:[function(require,module,exports){
 /**
  * wp.media.view.Attachments
  *
@@ -3627,7 +3613,7 @@
 
 		// The scroll event occurs on the document, but the element
 		// that should be checked is the document body.
-		if ( el == document ) {
+		if ( el === document ) {
 			el = document.body;
 			scrollTop = $(document).scrollTop();
 		}
@@ -3653,9 +3639,8 @@
 });
 
 module.exports = Attachments;
-},{"./attachment.js":23,"./view.js":71}],30:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./attachment.js":23,"./view.js":71}],30:[function(require,module,exports){
 /**
  * wp.media.view.AttachmentsBrowser
  *
@@ -3846,13 +3831,13 @@
 						return;
 					}
 
-					if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
+					if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
 						return;
 					}
 
 					if ( mediaTrash &&
 						'trash' !== selection.at( 0 ).get( 'status' ) &&
-						! confirm( l10n.warnBulkTrash ) ) {
+						! window.confirm( l10n.warnBulkTrash ) ) {
 
 						return;
 					}
@@ -3900,7 +3885,7 @@
 					click: function() {
 						var removed = [], selection = this.controller.state().get( 'selection' );
 
-						if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
+						if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
 							return;
 						}
 
@@ -4113,9 +4098,8 @@
 });
 
 module.exports = AttachmentsBrowser;
-},{"../attachment-compat.js":18,"../attachment-filters/all.js":20,"../attachment-filters/date.js":21,"../attachment-filters/uploaded.js":22,"../attachment/details.js":24,"../attachment/library.js":27,"../attachments.js":29,"../label.js":47,"../search.js":55,"../settings/attachment-display.js":58,"../sidebar.js":61,"../spinner.js":62,"../toolbar.js":63,"../uploader/inline.js":67,"../uploader/status.js":69,"../view.js":71}],31:[function(require,module,exports){
-/*globals _ */
 
+},{"../attachment-compat.js":18,"../attachment-filters/all.js":20,"../attachment-filters/date.js":21,"../attachment-filters/uploaded.js":22,"../attachment/details.js":24,"../attachment/library.js":27,"../attachments.js":29,"../label.js":47,"../search.js":55,"../settings/attachment-display.js":58,"../sidebar.js":61,"../spinner.js":62,"../toolbar.js":63,"../uploader/inline.js":67,"../uploader/status.js":69,"../view.js":71}],31:[function(require,module,exports){
 /**
  * wp.media.view.Attachments.Selection
  *
@@ -4145,9 +4129,8 @@
 });
 
 module.exports = Selection;
-},{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
-/*globals _, Backbone, jQuery */
 
+},{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
 /**
  * wp.media.view.ButtonGroup
  *
@@ -4194,9 +4177,8 @@
 });
 
 module.exports = ButtonGroup;
-},{"./button.js":33,"./view.js":71}],33:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./button.js":33,"./view.js":71}],33:[function(require,module,exports){
 /**
  * wp.media.view.Button
  *
@@ -4284,9 +4266,8 @@
 });
 
 module.exports = Button;
-},{"./view.js":71}],34:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./view.js":71}],34:[function(require,module,exports){
 /**
  * wp.media.view.Cropper
  *
@@ -4347,15 +4328,14 @@
 
 		this.views.add( '.upload-errors', new UploaderStatusError({
 			filename: UploaderStatus.prototype.filename(filename),
-			message: _wpMediaViewsL10n.cropError
+			message: window._wpMediaViewsL10n.cropError
 		}), { at: 0 });
 	}
 });
 
 module.exports = Cropper;
-},{"./uploader/status-error.js":68,"./uploader/status.js":69,"./view.js":71}],35:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./uploader/status-error.js":68,"./uploader/status.js":69,"./view.js":71}],35:[function(require,module,exports){
 var View = require( './view.js' ),
 	EditImage;
 
@@ -4407,6 +4387,7 @@
 });
 
 module.exports = EditImage;
+
 },{"./view.js":71}],36:[function(require,module,exports){
 /**
  * wp.media.view.Embed
@@ -4476,9 +4457,8 @@
 });
 
 module.exports = Embed;
-},{"./embed/image.js":37,"./embed/link.js":38,"./embed/url.js":39,"./view.js":71}],37:[function(require,module,exports){
-/*globals wp */
 
+},{"./embed/image.js":37,"./embed/link.js":38,"./embed/url.js":39,"./view.js":71}],37:[function(require,module,exports){
 /**
  * wp.media.view.EmbedImage
  *
@@ -4510,9 +4490,8 @@
 });
 
 module.exports = EmbedImage;
-},{"../settings/attachment-display.js":58}],38:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../settings/attachment-display.js":58}],38:[function(require,module,exports){
 /**
  * wp.media.view.EmbedLink
  *
@@ -4578,9 +4557,8 @@
 });
 
 module.exports = EmbedLink;
-},{"../settings.js":57}],39:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../settings.js":57}],39:[function(require,module,exports){
 /**
  * wp.media.view.EmbedUrl
  *
@@ -4658,6 +4636,7 @@
 });
 
 module.exports = EmbedUrl;
+
 },{"../view.js":71}],40:[function(require,module,exports){
 /**
  * wp.media.view.FocusManager
@@ -4706,9 +4685,8 @@
 });
 
 module.exports = FocusManager;
-},{"./view.js":71}],41:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./view.js":71}],41:[function(require,module,exports){
 /**
  * wp.media.view.Frame
  *
@@ -4879,9 +4857,8 @@
 _.extend( Frame.prototype, StateMachine.prototype );
 
 module.exports = Frame;
-},{"../controllers/region.js":12,"../controllers/state-machine.js":14,"../controllers/state.js":15,"./view.js":71}],42:[function(require,module,exports){
-/*globals wp */
 
+},{"../controllers/region.js":12,"../controllers/state-machine.js":14,"../controllers/state.js":15,"./view.js":71}],42:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.ImageDetails
  *
@@ -5063,9 +5040,8 @@
 });
 
 module.exports = ImageDetails;
-},{"../../controllers/edit-image.js":4,"../../controllers/image-details.js":9,"../../controllers/replace-image.js":13,"../edit-image.js":35,"../image-details.js":46,"../toolbar.js":63,"./select.js":44}],43:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../../controllers/edit-image.js":4,"../../controllers/image-details.js":9,"../../controllers/replace-image.js":13,"../edit-image.js":35,"../image-details.js":46,"../toolbar.js":63,"./select.js":44}],43:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Post
  *
@@ -5815,9 +5791,8 @@
 });
 
 module.exports = Post;
-},{"../../controllers/collection-add.js":1,"../../controllers/collection-edit.js":2,"../../controllers/edit-image.js":4,"../../controllers/embed.js":5,"../../controllers/featured-image.js":6,"../../controllers/gallery-add.js":7,"../../controllers/gallery-edit.js":8,"../../controllers/library.js":10,"../attachment/edit-selection.js":26,"../attachments/browser.js":30,"../edit-image.js":35,"../embed.js":36,"../selection.js":56,"../settings/playlist.js":60,"../toolbar.js":63,"../toolbar/embed.js":64,"../view.js":71,"./select.js":44}],44:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../../controllers/collection-add.js":1,"../../controllers/collection-edit.js":2,"../../controllers/edit-image.js":4,"../../controllers/embed.js":5,"../../controllers/featured-image.js":6,"../../controllers/gallery-add.js":7,"../../controllers/gallery-edit.js":8,"../../controllers/library.js":10,"../attachment/edit-selection.js":26,"../attachments/browser.js":30,"../edit-image.js":35,"../embed.js":36,"../selection.js":56,"../settings/playlist.js":60,"../toolbar.js":63,"../toolbar/embed.js":64,"../view.js":71,"./select.js":44}],44:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Select
  *
@@ -5990,6 +5965,7 @@
 });
 
 module.exports = Select;
+
 },{"../../controllers/library.js":10,"../attachments/browser.js":30,"../media-frame.js":48,"../toolbar/select.js":65,"../uploader/inline.js":67}],45:[function(require,module,exports){
 /**
  * wp.media.view.Iframe
@@ -6016,9 +5992,8 @@
 });
 
 module.exports = Iframe;
-},{"./view.js":71}],46:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./view.js":71}],46:[function(require,module,exports){
 /**
  * wp.media.view.ImageDetails
  *
@@ -6092,7 +6067,7 @@
 	postRender: function() {
 		setTimeout( _.bind( this.resetFocus, this ), 10 );
 		this.toggleLinkSettings();
-		if ( getUserSetting( 'advImgDetails' ) === 'show' ) {
+		if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
 			this.toggleAdvanced( true );
 		}
 		this.trigger( 'post-render' );
@@ -6165,7 +6140,7 @@
 			mode = 'show';
 		}
 
-		setUserSetting( 'advImgDetails', mode );
+		window.setUserSetting( 'advImgDetails', mode );
 	},
 
 	editAttachment: function( event ) {
@@ -6185,6 +6160,7 @@
 });
 
 module.exports = AttachmentDisplay;
+
 },{"./settings/attachment-display.js":58}],47:[function(require,module,exports){
 /**
  * @class
@@ -6211,9 +6187,8 @@
 });
 
 module.exports = Label;
-},{"./view.js":71}],48:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./view.js":71}],48:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame
  *
@@ -6466,9 +6441,8 @@
 });
 
 module.exports = MediaFrame;
-},{"./frame.js":41,"./iframe.js":45,"./menu.js":50,"./modal.js":51,"./router.js":54,"./toolbar.js":63,"./uploader/window.js":70,"./view.js":71}],49:[function(require,module,exports){
-/*globals wp, jQuery */
 
+},{"./frame.js":41,"./iframe.js":45,"./menu.js":50,"./modal.js":51,"./router.js":54,"./toolbar.js":63,"./uploader/window.js":70,"./view.js":71}],49:[function(require,module,exports){
 /**
  * wp.media.view.MenuItem
  *
@@ -6540,6 +6514,7 @@
 });
 
 module.exports = MenuItem;
+
 },{"./view.js":71}],50:[function(require,module,exports){
 /**
  * wp.media.view.Menu
@@ -6656,9 +6631,8 @@
 });
 
 module.exports = Menu;
-},{"./menu-item.js":49,"./priority-list.js":52}],51:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"./menu-item.js":49,"./priority-list.js":52}],51:[function(require,module,exports){
 /**
  * wp.media.view.Modal
  *
@@ -6872,9 +6846,8 @@
 });
 
 module.exports = Modal;
-},{"./focus-manager.js":40,"./view.js":71}],52:[function(require,module,exports){
-/*globals _, Backbone */
 
+},{"./focus-manager.js":40,"./view.js":71}],52:[function(require,module,exports){
 /**
  * wp.media.view.PriorityList
  *
@@ -6973,6 +6946,7 @@
 });
 
 module.exports = PriorityList;
+
 },{"./view.js":71}],53:[function(require,module,exports){
 /**
  * wp.media.view.RouterItem
@@ -6999,6 +6973,7 @@
 });
 
 module.exports = RouterItem;
+
 },{"./menu-item.js":49}],54:[function(require,module,exports){
 /**
  * wp.media.view.Router
@@ -7036,9 +7011,8 @@
 });
 
 module.exports = Router;
-},{"./menu.js":50,"./router-item.js":53}],55:[function(require,module,exports){
-/*globals wp */
 
+},{"./menu.js":50,"./router-item.js":53}],55:[function(require,module,exports){
 /**
  * wp.media.view.Search
  *
@@ -7086,9 +7060,8 @@
 });
 
 module.exports = Search;
-},{"./view.js":71}],56:[function(require,module,exports){
-/*globals _, Backbone, wp */
 
+},{"./view.js":71}],56:[function(require,module,exports){
 /**
  * wp.media.view.Selection
  *
@@ -7172,9 +7145,8 @@
 });
 
 module.exports = Selection;
-},{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
-/*globals _, Backbone, jQuery */
 
+},{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
 /**
  * wp.media.view.Settings
  *
@@ -7282,7 +7254,7 @@
 		// If the setting has a corresponding user setting,
 		// update that as well.
 		if ( userSetting = $setting.data('userSetting') ) {
-			setUserSetting( userSetting, value );
+			window.setUserSetting( userSetting, value );
 		}
 	},
 
@@ -7294,9 +7266,8 @@
 });
 
 module.exports = Settings;
-},{"./view.js":71}],58:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./view.js":71}],58:[function(require,module,exports){
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -7389,9 +7360,8 @@
 });
 
 module.exports = AttachmentDisplay;
-},{"../settings.js":57}],59:[function(require,module,exports){
-/*globals wp */
 
+},{"../settings.js":57}],59:[function(require,module,exports){
 /**
  * wp.media.view.Settings.Gallery
  *
@@ -7410,9 +7380,8 @@
 });
 
 module.exports = Gallery;
-},{"../settings.js":57}],60:[function(require,module,exports){
-/*globals wp */
 
+},{"../settings.js":57}],60:[function(require,module,exports){
 /**
  * wp.media.view.Settings.Playlist
  *
@@ -7431,6 +7400,7 @@
 });
 
 module.exports = Playlist;
+
 },{"../settings.js":57}],61:[function(require,module,exports){
 /**
  * wp.media.view.Sidebar
@@ -7449,9 +7419,8 @@
 });
 
 module.exports = Sidebar;
-},{"./priority-list.js":52}],62:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./priority-list.js":52}],62:[function(require,module,exports){
 /**
  * wp.media.view.Spinner
  *
@@ -7488,9 +7457,8 @@
 });
 
 module.exports = Spinner;
-},{"./view.js":71}],63:[function(require,module,exports){
-/*globals Backbone, _ */
 
+},{"./view.js":71}],63:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar
  *
@@ -7651,9 +7619,8 @@
 });
 
 module.exports = Toolbar;
-},{"./button.js":33,"./priority-list.js":52,"./view.js":71}],64:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./button.js":33,"./priority-list.js":52,"./view.js":71}],64:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar.Embed
  *
@@ -7689,9 +7656,8 @@
 });
 
 module.exports = Embed;
-},{"./select.js":65}],65:[function(require,module,exports){
-/*globals _, wp */
 
+},{"./select.js":65}],65:[function(require,module,exports){
 /**
  * wp.media.view.Toolbar.Select
  *
@@ -7760,9 +7726,8 @@
 });
 
 module.exports = Select;
-},{"../toolbar.js":63}],66:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../toolbar.js":63}],66:[function(require,module,exports){
 /**
  * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
  * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
@@ -7980,9 +7945,8 @@
 });
 
 module.exports = EditorUploader;
-},{"../view.js":71}],67:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../view.js":71}],67:[function(require,module,exports){
 /**
  * wp.media.view.UploaderInline
  *
@@ -8113,9 +8077,8 @@
 });
 
 module.exports = UploaderInline;
-},{"../view.js":71,"./status.js":69}],68:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":71,"./status.js":69}],68:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatusError
  *
@@ -8133,9 +8096,8 @@
 });
 
 module.exports = UploaderStatusError;
-},{"../view.js":71}],69:[function(require,module,exports){
-/*globals _, wp */
 
+},{"../view.js":71}],69:[function(require,module,exports){
 /**
  * wp.media.view.UploaderStatus
  *
@@ -8273,9 +8235,8 @@
 });
 
 module.exports = UploaderStatus;
-},{"../view.js":71,"./status-error.js":68}],70:[function(require,module,exports){
-/*globals _, wp, jQuery */
 
+},{"../view.js":71,"./status-error.js":68}],70:[function(require,module,exports){
 /**
  * wp.media.view.UploaderWindow
  *
@@ -8386,9 +8347,8 @@
 });
 
 module.exports = UploaderWindow;
-},{"../view.js":71}],71:[function(require,module,exports){
-/*globals wp */
 
+},{"../view.js":71}],71:[function(require,module,exports){
 /**
  * wp.media.View
  *
@@ -8453,4 +8413,5 @@
 });
 
 module.exports = View;
+
 },{}]},{},[17]);
Index: src/wp-includes/js/media/views.manifest.js
===================================================================
--- src/wp-includes/js/media/views.manifest.js	(revision 31383)
+++ src/wp-includes/js/media/views.manifest.js	(working copy)
@@ -1,4 +1,4 @@
-/* global _wpMediaViewsL10n, confirm, getUserSetting, setUserSetting */
+/* global _wpMediaViewsL10n */
 ( function( $, _ ) {
 	var l10n,
 		media = wp.media;