From b84fba0c86c174de8df7e6550bf40ed793896b30 Mon Sep 17 00:00:00 2001
From: James Elliott <james.elliott@acquia.com>
Date: Mon, 11 Apr 2011 10:25:20 -0400
Subject: [PATCH 4/4] #1123534: Remove the unneccessary media.core.js file and the references to the namespace function

---
 includes/media.theme.inc    |    1 +
 js/media.admin.js           |    2 ++
 js/media.browser.js         |    4 +++-
 js/media.core.js            |   19 -------------------
 js/media.format_form.js     |    4 +++-
 js/media.js                 |    2 ++
 js/media.popups.js          |    4 +++-
 js/plugins/media.fromurl.js |    4 +++-
 js/plugins/media.library.js |    4 +++-
 js/plugins/media.upload.js  |    4 +++-
 10 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 js/media.core.js

diff --git a/includes/media.theme.inc b/includes/media.theme.inc
index 1b5f373..3098152 100644
--- a/includes/media.theme.inc
+++ b/includes/media.theme.inc
@@ -189,6 +189,7 @@ function theme_media_admin_thumbnail_operations($variables) {
  * Add messages to the page.
  */
 function template_preprocess_media_dialog_page(&$variables) {
+  kpr($variables);
   $variables['messages'] = theme('status_messages');
 }
 
diff --git a/js/media.admin.js b/js/media.admin.js
index b78cbbb..dd8f6b6 100644
--- a/js/media.admin.js
+++ b/js/media.admin.js
@@ -9,6 +9,8 @@
 
 (function ($) {
 
+Drupal.media = Drupal.media || {};
+
 /**
  * Functionality for the thumbnail display
  */
diff --git a/js/media.browser.js b/js/media.browser.js
index 1b30b1d..abe48ba 100644
--- a/js/media.browser.js
+++ b/js/media.browser.js
@@ -1,6 +1,8 @@
 
 (function ($) {
-namespace('Drupal.media.browser');
+  
+Drupal.media = Drupal.media || {};
+Drupal.media.browser = Drupal.media.browser || {};
 
 Drupal.media.browser.selectedMedia = [];
 Drupal.media.browser.mediaAdded = function () {};
diff --git a/js/media.core.js b/js/media.core.js
deleted file mode 100644
index f99971c..0000000
--- a/js/media.core.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/**
- * Creates a namespace.
- *
- * @return
- *   The created namespace object.
- */
-function namespace () {
-  var a=arguments, o=null, i, j, d;
-  for (i=0; i<a.length; i=i+1) {
-    d=a[i].split(".");
-    o=window;
-    for (j=0; j<d.length; j=j+1) {
-      o[d[j]]=o[d[j]] || {};
-      o=o[d[j]];
-    }
-  }
-  return o;
-};
diff --git a/js/media.format_form.js b/js/media.format_form.js
index 4d892b1..a2755bb 100644
--- a/js/media.format_form.js
+++ b/js/media.format_form.js
@@ -6,7 +6,9 @@
  */
 
 (function ($) {
-namespace('Drupal.media.formatForm');
+
+Drupal.media = Drupal.media || {};
+Drupal.media.formatForm = Drupal.media.formatForm || {};
 
 Drupal.media.mediaFormatSelected = {};
 
diff --git a/js/media.js b/js/media.js
index 91b2c3c..d135c86 100644
--- a/js/media.js
+++ b/js/media.js
@@ -6,6 +6,8 @@
 
 (function ($) {
 
+Drupal.media = Drupal.media || {};
+
 /**
  * Loads media browsers and callbacks, specifically for media as a field.
  */
diff --git a/js/media.popups.js b/js/media.popups.js
index aea0710..e251a8a 100644
--- a/js/media.popups.js
+++ b/js/media.popups.js
@@ -12,7 +12,9 @@
  */
 
 (function ($) {
-namespace('Drupal.media.popups');
+
+Drupal.media = Drupal.media || {};
+Drupal.media.popups = Drupal.media.popups || {};
 
 /**
  * Media browser popup. Creates a media browser dialog.
diff --git a/js/plugins/media.fromurl.js b/js/plugins/media.fromurl.js
index f618e23..372e0d9 100644
--- a/js/plugins/media.fromurl.js
+++ b/js/plugins/media.fromurl.js
@@ -1,6 +1,8 @@
 
 (function ($) {
-namespace('Drupal.media.browser.plugin');
+
+Drupal.media = Drupal.media || {};
+Drupal.media.browser = Drupal.media.browser || {};
 
 Drupal.media.browser.plugin.fromurl = function (mediaBrowser, options) {
   return {
diff --git a/js/plugins/media.library.js b/js/plugins/media.library.js
index c3b1ee5..859895b 100644
--- a/js/plugins/media.library.js
+++ b/js/plugins/media.library.js
@@ -1,6 +1,8 @@
 
 (function ($) {
-namespace('Drupal.media.browser');
+
+Drupal.media = Drupal.media || {};
+Drupal.media.browser = Drupal.media.browser || {};
 
 Drupal.behaviors.mediaLibrary = {
   attach: function (context, settings) {
diff --git a/js/plugins/media.upload.js b/js/plugins/media.upload.js
index 6f0117d..895eafd 100644
--- a/js/plugins/media.upload.js
+++ b/js/plugins/media.upload.js
@@ -1,6 +1,8 @@
 
 (function ($) {
-namespace('Drupal.media.browser.plugin');
+
+Drupal.media = Drupal.media || {};
+Drupal.media.browser = Drupal.media.browser || {};
 
 Drupal.media.browser.plugin.upload = function (mediaBrowser, options) {
   return {
-- 
1.7.4.msysgit.0