From f610606c03468622510d457b2aa4dd9487f383de Mon Sep 17 00:00:00 2001 From: Katherine Bailey Date: Wed, 4 May 2011 14:32:23 -0700 Subject: [PATCH] Issue #1144422: Adding multiple multimedia assets changes iframe source url --- js/media.popups.js | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git js/media.popups.js js/media.popups.js index aea0710..7b3f508 100644 --- js/media.popups.js +++ js/media.popups.js @@ -105,13 +105,17 @@ Drupal.media.popups.mediaBrowser.mediaBrowserOnLoad = function (e) { }; Drupal.media.popups.mediaBrowser.getDefaults = function () { + var browserUrl = Drupal.settings.media.browserUrl; + if (browserUrl.constructor.toString().indexOf("Array") != -1) { + browserUrl = Drupal.settings.media.browserUrl[0]; + } return { global: { types: [], // Types to allow, defaults to all. activePlugins: [] // If provided, a list of plugins which should be enabled. }, widget: { // Settings for the actual iFrame which is launched. - src: Drupal.settings.media.browserUrl, // Src of the media browser (if you want to totally override it) + src: browserUrl, // Src of the media browser (if you want to totally override it) onLoad: Drupal.media.popups.mediaBrowser.mediaBrowserOnLoad // Onload function when iFrame loads. }, dialog: Drupal.media.popups.getDialogOptions() -- 1.7.4.1