From 8039bfe1217547283a012690a3e453f8f6a60e5a Mon Sep 17 00:00:00 2001
From: Jorge Barnaby <jorge.barnaby@gmail.com>
Date: Fri, 8 Mar 2013 11:19:42 -0500
Subject: [PATCH 1/5] jquery.dialog2.iframe (to handle modal windows with
 iframe inside).

---
 lib/jquery.dialog2.iframe.js | 84 ++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 lib/jquery.dialog2.iframe.js

diff --git a/lib/jquery.dialog2.iframe.js b/lib/jquery.dialog2.iframe.js
new file mode 100644
index 0000000..93c6854
--- /dev/null
+++ b/lib/jquery.dialog2.iframe.js
@@ -0,0 +1,84 @@
+/*
+* jQuery Dialog2 IFrame
+* 
+* Licensed under the MIT license 
+* http://www.opensource.org/licenses/mit-license.php 
+* 
+* @version: 1.0.1 (17/05/2012)
+* 
+* @requires jQuery >= 1.4 
+* 
+* @requires jQuery.dialog2 plugin >= 1.1
+* 
+* @author Jorge Barnaby (jorge.barnaby {at} gmail.com)
+*/
+(function ($) {
+
+    /*
+    * Shows a web page (using iframe) in a jQuery dialog2 (Bootstrap style).
+    *
+    */
+    $.fn.dialog2IFrame = function (options) {
+        options = $.extend({}, $.fn.dialog2IFrame.defaults, options);
+        $(this).click(function (e) {
+            e.preventDefault();
+            var idDialogOuter = "dialog-iframe-outer";
+            //Creates the div and iframe on body to contain load the URL
+            if ($('#' + idDialogOuter).length == 0) {
+                $('<div id="' + idDialogOuter + '"><iframe frameborder="0" /></div>')
+                    .appendTo(document.body).hide();
+            }
+
+            var mainWin = window;
+            var btn = this;
+            var dialogOuter = $('#' + idDialogOuter);
+            var dialogFrame = dialogOuter.find('iframe');
+
+            //Append &iframe=true to url
+            var newURL = this.protocol + "//" +
+                    UrlLastSlash(this.host) +
+                    RemoveStartingSlash(this.pathname) +
+                    $.query.load(this.href).set("iframe", "true").copy();
+
+            dialogFrame.attr('src', newURL);
+            //dialogFrame.attr('src', this.href); //former URL
+
+            var h = options.height;
+            dialogFrame.css('height', h);
+
+            dialogOuter.css('overflow', 'hidden');
+            dialogOuter.css('padding', '0 10px');
+            dialogOuter.css('margin', '0');
+
+            var dialog = dialogOuter.dialog2(
+                {
+                    title: $(btn).attr('data-original-title') ? $(btn).attr('data-original-title') : '',
+                    buttons: {
+                        Close: {
+                            click: function () {
+                                options.close();
+                                $(this).dialog2('close');
+                                if ($(btn).hasClass('reload-on-close')) {
+                                    mainWin.location.reload();
+                                }
+                            }
+                        }
+                    },
+                    autoOpen: true,
+                    closeOnOverlayClick: false,
+                    closeOnEscape: false,
+                    removeOnClose: true,
+                    showCloseHandle: false,
+                    initialLoadText: "Loading..."
+                })
+                .find('iframe').width($('.modal').width() - 20) // Sets the iFrame width to the same as the modal;
+        });
+    }
+
+    $.fn.dialog2IFrame.defaults = {
+        height: 300,
+        close: function () {
+            return true;
+        }
+    };
+})(jQuery);
\ No newline at end of file

From 14ee397b8f79bb09a1752a46458e398dbffb2488 Mon Sep 17 00:00:00 2001
From: Jorge Barnaby <jorge.barnaby@gmail.com>
Date: Fri, 8 Mar 2013 11:53:11 -0500
Subject: [PATCH 2/5] IFrame Dialog improved and fixed.

---
 lib/jquery.dialog2.iframe.js |  35 ++++--
 samples/index.html           |  17 ++-
 samples/js/jquery.query.js   | 224 +++++++++++++++++++++++++++++++++++
 samples/pages/iframe.html    |  12 ++
 4 files changed, 277 insertions(+), 11 deletions(-)
 create mode 100644 samples/js/jquery.query.js
 create mode 100644 samples/pages/iframe.html

diff --git a/lib/jquery.dialog2.iframe.js b/lib/jquery.dialog2.iframe.js
index 93c6854..96d84a8 100644
--- a/lib/jquery.dialog2.iframe.js
+++ b/lib/jquery.dialog2.iframe.js
@@ -10,6 +10,8 @@
 * 
 * @requires jQuery.dialog2 plugin >= 1.1
 * 
+* @requires jQuery.query plugin >= 2.1.7
+* 
 * @author Jorge Barnaby (jorge.barnaby {at} gmail.com)
 */
 (function ($) {
@@ -31,17 +33,23 @@
 
             var mainWin = window;
             var btn = this;
+            var $btn = $(btn);
             var dialogOuter = $('#' + idDialogOuter);
             var dialogFrame = dialogOuter.find('iframe');
+            var url = btn.href;
 
-            //Append &iframe=true to url
-            var newURL = this.protocol + "//" +
-                    UrlLastSlash(this.host) +
-                    RemoveStartingSlash(this.pathname) +
-                    $.query.load(this.href).set("iframe", "true").copy();
+            if (options.appendParamUrl) {
+                // Appends &iframe=true to url
+                url = btn.protocol + "//" +
+                    // Add trailing '/'' if not exists
+                    (btn.host.charAt(this.host.length - 1) != '/' ? btn.host + '/' : btn.host) +
+                    // Remove starting '/'' if exists
+                    (btn.pathname.charAt(0) == '/' ? btn.pathname.substr(1, btn.pathname.length - 1) : btn.pathname) +
+                    $.query.load(btn.href).set("iframe", "true").copy();
+            }
 
-            dialogFrame.attr('src', newURL);
-            //dialogFrame.attr('src', this.href); //former URL
+            // Adds URL to iframe src
+            dialogFrame.attr('src', url);
 
             var h = options.height;
             dialogFrame.css('height', h);
@@ -52,13 +60,16 @@
 
             var dialog = dialogOuter.dialog2(
                 {
-                    title: $(btn).attr('data-original-title') ? $(btn).attr('data-original-title') : '',
+                    title: $btn.attr('title'),
                     buttons: {
                         Close: {
                             click: function () {
                                 options.close();
                                 $(this).dialog2('close');
-                                if ($(btn).hasClass('reload-on-close')) {
+                                // If caller has the CSS Class 'reload-on-close' or
+                                // reloadOnClose option is true,
+                                // the main page will be reloaded on close.
+                                if ($btn.hasClass('reload-on-close') || options.reloadOnClose) {
                                     mainWin.location.reload();
                                 }
                             }
@@ -71,12 +82,16 @@
                     showCloseHandle: false,
                     initialLoadText: "Loading..."
                 })
-                .find('iframe').width($('.modal').width() - 20) // Sets the iFrame width to the same as the modal;
+                .find('iframe').width($('.modal').width() - 20) // Sets the IFrame width to the same as the modal;
         });
     }
 
     $.fn.dialog2IFrame.defaults = {
         height: 300,
+        // Appends &iframe=true to URL opened on IFrame
+        appendParamUrl: false,
+        // Reloads main page when modal is closed
+        reloadOnClose: false,
         close: function () {
             return true;
         }
diff --git a/samples/index.html b/samples/index.html
index e3ed535..5a25ac1 100644
--- a/samples/index.html
+++ b/samples/index.html
@@ -6,8 +6,10 @@
         <script type="text/javascript" src="js/jquery.1.6.2.min.js"></script>
         <script type="text/javascript" src="js/jquery.controls.js"></script>
         <script type="text/javascript" src="js/jquery.form.js"></script>
+        <script type="text/javascript" src="js/jquery.query.js"></script>
         <script type="text/javascript" src="../lib/jquery.dialog2.js"></script>
         <script type="text/javascript" src="../lib/jquery.dialog2.helpers.js"></script>
+        <script type="text/javascript" src="../lib/jquery.dialog2.iframe.js"></script>
         <script type="text/javascript" src="js/prettify.js"></script>
         
         <style type="text/css">
@@ -709,7 +711,7 @@ <h2>Hook into the behaviour of the dialog using events</h2>
 							<tr><td><code>dialog2.closed</code></td><td>the dialog is closed</td><tr>
 						</tbody>
 					</table>
-					
+
 					<script type="text/javascript">
 						$(function() {
 							var eventLog = [];
@@ -758,6 +760,19 @@ <h2>Hook into the behaviour of the dialog using events</h2>
 						});
 					</script>
 					
+                    <h2>Open external websites within an iframe in your modal</h2>
+                    
+                    <div class="activity">
+                        <p>
+                            Open <a href="pages/iframe.html" id="dialog-iframe" title="IFrame Content">a dialog</a> with an iframe inside.<br/>
+                            <a class="show-source-link" href="#">(View source)</a>
+                        </p>
+                    </div>
+
+                    <script type-"text/javascript">
+                        $('#dialog-iframe').dialog2IFrame();
+                    </script>
+
                     <h2>Clarification needed?</h2>
                     <p>
                         Check out the <a href="https://github.com/Nikku/jquery-bootstrap-scripting/#readme">plugin documentation</a>. 
diff --git a/samples/js/jquery.query.js b/samples/js/jquery.query.js
new file mode 100644
index 0000000..4607fe5
--- /dev/null
+++ b/samples/js/jquery.query.js
@@ -0,0 +1,224 @@
+/**
+* jQuery.query - Query String Modification and Creation for jQuery
+* Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
+* Licensed under the WTFPL (http://sam.zoy.org/wtfpl/).
+* Date: 2009/8/13
+*
+* @author Blair Mitchelmore
+* @version 2.1.7
+*
+**/
+new function(settings) {
+    // Various Settings
+    var $separator = settings.separator || '&';
+    var $spaces = settings.spaces === false ? false : true;
+    var $suffix = settings.suffix === false ? '' : '[]';
+    var $prefix = settings.prefix === false ? false : true;
+    var $hash = $prefix ? settings.hash === true ? "#" : "?" : "";
+    var $numbers = settings.numbers === false ? false : true;
+
+    jQuery.query = new function() {
+        var is = function(o, t) {
+            return o != undefined && o !== null && (!!t ? o.constructor == t : true);
+        };
+        var parse = function(path) {
+            var m, rx = /\[([^[]*)\]/g, match = /^([^[]+)(\[.*\])?$/.exec(path), base = match[1], tokens = [];
+            while (m = rx.exec(match[2])) tokens.push(m[1]);
+            return [base, tokens];
+        };
+        var set = function(target, tokens, value) {
+            var o, token = tokens.shift();
+            if (typeof target != 'object') target = null;
+            if (token === "") {
+                if (!target) target = [];
+                if (is(target, Array)) {
+                    target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
+                } else if (is(target, Object)) {
+                    var i = 0;
+                    while (target[i++] != null);
+                    target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value);
+                } else {
+                    target = [];
+                    target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value));
+                }
+            } else if (token && token.match(/^\s*[0-9]+\s*$/)) {
+                var index = parseInt(token, 10);
+                if (!target) target = [];
+                target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
+            } else if (token) {
+                var index = token.replace(/^\s*|\s*$/g, "");
+                if (!target) target = {};
+                if (is(target, Array)) {
+                    var temp = {};
+                    for (var i = 0; i < target.length; ++i) {
+                        temp[i] = target[i];
+                    }
+                    target = temp;
+                }
+                target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value);
+            } else {
+                return value;
+            }
+            return target;
+        };
+
+        var queryObject = function(a) {
+            var self = this;
+            self.keys = {};
+
+            if (a.queryObject) {
+                jQuery.each(a.get(), function(key, val) {
+                    self.SET(key, val);
+                });
+            } else {
+                jQuery.each(arguments, function() {
+                    var q = "" + this;
+                    q = q.replace(/^[?#]/, ''); // remove any leading ? || #
+                    q = q.replace(/[;&]$/, ''); // remove any trailing & || ;
+                    if ($spaces) q = q.replace(/[+]/g, ' '); // replace +'s with spaces
+
+                    jQuery.each(q.split(/[&;]/), function() {
+                        var key = decodeURIComponent(this.split('=')[0] || "");
+                        var val = decodeURIComponent(this.split('=')[1] || "");
+
+                        if (!key) return;
+
+                        if ($numbers) {
+                            if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex
+                                val = parseFloat(val);
+                            else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex
+                                val = parseInt(val, 10);
+                        }
+
+                        val = (!val && val !== 0) ? true : val;
+
+                        if (val !== false && val !== true && typeof val != 'number')
+                            val = val;
+
+                        self.SET(key, val);
+                    });
+                });
+            }
+            return self;
+        };
+
+        queryObject.prototype = {
+            queryObject: true,
+            has: function(key, type) {
+                var value = this.get(key);
+                return is(value, type);
+            },
+            GET: function(key) {
+                if (!is(key)) return this.keys;
+                var parsed = parse(key), base = parsed[0], tokens = parsed[1];
+                var target = this.keys[base];
+                while (target != null && tokens.length != 0) {
+                    target = target[tokens.shift()];
+                }
+                return typeof target == 'number' ? target : target || "";
+            },
+            get: function(key) {
+                var target = this.GET(key);
+                if (is(target, Object))
+                    return jQuery.extend(true, {}, target);
+                else if (is(target, Array))
+                    return target.slice(0);
+                return target;
+            },
+            SET: function(key, val) {
+                var value = !is(val) ? null : val;
+                var parsed = parse(key), base = parsed[0], tokens = parsed[1];
+                var target = this.keys[base];
+                this.keys[base] = set(target, tokens.slice(0), value);
+                return this;
+            },
+            set: function(key, val) {
+                return this.copy().SET(key, val);
+            },
+            REMOVE: function(key) {
+                return this.SET(key, null).COMPACT();
+            },
+            remove: function(key) {
+                return this.copy().REMOVE(key);
+            },
+            EMPTY: function() {
+                var self = this;
+                jQuery.each(self.keys, function(key, value) {
+                    delete self.keys[key];
+                });
+                return self;
+            },
+            load: function(url) {
+                var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1");
+                var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1");
+                return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash);
+            },
+            empty: function() {
+                return this.copy().EMPTY();
+            },
+            copy: function() {
+                return new queryObject(this);
+            },
+            COMPACT: function() {
+                function build(orig) {
+                    var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig;
+                    if (typeof orig == 'object') {
+                        function add(o, key, value) {
+                            if (is(o, Array))
+                                o.push(value);
+                            else
+                                o[key] = value;
+                        }
+                        jQuery.each(orig, function(key, value) {
+                            if (!is(value)) return true;
+                            add(obj, key, build(value));
+                        });
+                    }
+                    return obj;
+                }
+                this.keys = build(this.keys);
+                return this;
+            },
+            compact: function() {
+                return this.copy().COMPACT();
+            },
+            toString: function() {
+                var i = 0, queryString = [], chunks = [], self = this;
+                var encode = function(str) {
+                    str = str + "";
+                    if ($spaces) str = str.replace(/ /g, "+");
+                    return encodeURIComponent(str);
+                };
+                var addFields = function(arr, key, value) {
+                    if (!is(value) || value === false) return;
+                    var o = [encode(key)];
+                    if (value !== true) {
+                        o.push("=");
+                        o.push(encode(value));
+                    }
+                    arr.push(o.join(""));
+                };
+                var build = function(obj, base) {
+                    var newKey = function(key) {
+                        return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join("");
+                    };
+                    jQuery.each(obj, function(key, value) {
+                        if (typeof value == 'object')
+                            build(value, newKey(key));
+                        else
+                            addFields(chunks, newKey(key), value);
+                    });
+                };
+
+                build(this.keys);
+
+                if (chunks.length > 0) queryString.push($hash);
+                queryString.push(chunks.join($separator));
+
+                return queryString.join("");
+            }
+        };
+
+        return new queryObject(location.search, location.hash);
+    };
+} (jQuery.query || {}); // Pass in jQuery.query as settings object
\ No newline at end of file
diff --git a/samples/pages/iframe.html b/samples/pages/iframe.html
new file mode 100644
index 0000000..781e786
--- /dev/null
+++ b/samples/pages/iframe.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>jQuery dialog2 plugin</title>
+    </head>
+    <body>
+        <h1>This is an IFrame</h1>
+        <p>
+            This is some fine body.
+        </p>
+    </body>
+</html>
\ No newline at end of file

From b261ba0bde65ed13f6debc3e6331b9915823c868 Mon Sep 17 00:00:00 2001
From: Jorge Barnaby <jorge.barnaby@gmail.com>
Date: Fri, 8 Mar 2013 11:59:33 -0500
Subject: [PATCH 3/5] IFrame Dialog documentation improved (source code).

---
 samples/index.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/samples/index.html b/samples/index.html
index 5a25ac1..456a3ef 100644
--- a/samples/index.html
+++ b/samples/index.html
@@ -764,10 +764,24 @@ <h2>Open external websites within an iframe in your modal</h2>
                     
                     <div class="activity">
                         <p>
-                            Open <a href="pages/iframe.html" id="dialog-iframe" title="IFrame Content">a dialog</a> with an iframe inside.<br/>
+                            Open <a href="pages/iframe.html" id="dialog-iframe" title="IFrame Title">a dialog</a> with an iframe inside.<br/>
                             <a class="show-source-link" href="#">(View source)</a>
                         </p>
                     </div>
+                    <div class="source">
+                        <h5>Source</h5>
+                            <pre class="prettyprint lang-html">
+&lt;a href=&quot;pages/iframe.html&quot; id=&quot;dialog-iframe&quot; title=&quot;IFrame Title&quot;&gt;open external url!&lt;/a&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+    $(function() {
+        $(&quot;#dialog-iframe&quot;).dialog2IFrame({
+            height: 300,
+            appendParamUrl: false,
+            reloadOnClose: false
+        });
+    });
+&lt;/script&gt;</pre>
+                        </div>
 
                     <script type-"text/javascript">
                         $('#dialog-iframe').dialog2IFrame();

From be3e196ef214518ce703d37252182ad22701686d Mon Sep 17 00:00:00 2001
From: Jorge Barnaby <jorge.barnaby@gmail.com>
Date: Fri, 8 Mar 2013 12:19:36 -0500
Subject: [PATCH 4/5] README.md updated.

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c5ac4f7..8c0b321 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,14 @@ Contains some nice [jQuery](http://jquery.com) plugins to make working with the
 * Localization
 * No dependencies to jQuery.UI
 * Control via [`html` markup](#let-the-markup-rule) possible
+* Load an external URL (using iframe) inside the modal
 
 ## Dependencies
 
 * [jQuery.form](http://jquery.malsup.com/form/) plugin >= 2.8 for ajax form submit 
 * [jQuery.controls](https://github.com/Nikku/jquery-controls) plugin  >= 0.9 for ajax link binding support
 * [Bootstrap styles](http://twitter.github.com/bootstrap) 2.x to look nice
+* [jQuery.query](http://archive.plugins.jquery.com/project/query-object) plugin for handling urls in jquery.dialog2.iframe
 
 ## Migrating from earlier versions
 * Migration from 1.x:

From 4ec3df1c1ae268a9e83ae25e793b48ac8638292b Mon Sep 17 00:00:00 2001
From: Jorge Barnaby <jorge.barnaby@gmail.com>
Date: Sat, 9 Mar 2013 23:19:46 -0500
Subject: [PATCH 5/5] jquery.dialog2.iframe fixed and improved (iframe height,
 etc).

---
 lib/jquery.dialog2.iframe.js | 90 ++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/lib/jquery.dialog2.iframe.js b/lib/jquery.dialog2.iframe.js
index 96d84a8..ff96f18 100644
--- a/lib/jquery.dialog2.iframe.js
+++ b/lib/jquery.dialog2.iframe.js
@@ -4,7 +4,7 @@
 * Licensed under the MIT license 
 * http://www.opensource.org/licenses/mit-license.php 
 * 
-* @version: 1.0.1 (17/05/2012)
+* @version: 1.0.2 (08/03/2013)
 * 
 * @requires jQuery >= 1.4 
 * 
@@ -25,73 +25,83 @@
         $(this).click(function (e) {
             e.preventDefault();
             var idDialogOuter = "dialog-iframe-outer";
-            //Creates the div and iframe on body to contain load the URL
-            if ($('#' + idDialogOuter).length == 0) {
-                $('<div id="' + idDialogOuter + '"><iframe frameborder="0" /></div>')
-                    .appendTo(document.body).hide();
-            }
 
             var mainWin = window;
             var btn = this;
             var $btn = $(btn);
-            var dialogOuter = $('#' + idDialogOuter);
-            var dialogFrame = dialogOuter.find('iframe');
+            var $dialogOuter = $('#' + idDialogOuter).length ?
+                $('#' + idDialogOuter) :
+                $('<div id="' + idDialogOuter + '"></div>').hide().appendTo(document.body);
+            var $dialogFrame = $('iframe', $dialogOuter).length ?
+                $('iframe', dialogOuter) :
+                $('<iframe frameborder="0" />').appendTo($dialogOuter);
             var url = btn.href;
 
             if (options.appendParamUrl) {
                 // Appends &iframe=true to url
                 url = btn.protocol + "//" +
                     // Add trailing '/'' if not exists
-                    (btn.host.charAt(this.host.length - 1) != '/' ? btn.host + '/' : btn.host) +
+                    (btn.host.charAt(btn.host.length - 1) != '/' ? btn.host + '/' : btn.host) +
                     // Remove starting '/'' if exists
                     (btn.pathname.charAt(0) == '/' ? btn.pathname.substr(1, btn.pathname.length - 1) : btn.pathname) +
                     $.query.load(btn.href).set("iframe", "true").copy();
             }
 
             // Adds URL to iframe src
-            dialogFrame.attr('src', url);
-
-            var h = options.height;
-            dialogFrame.css('height', h);
+            $dialogFrame.attr('src', url);
 
-            dialogOuter.css('overflow', 'hidden');
-            dialogOuter.css('padding', '0 10px');
-            dialogOuter.css('margin', '0');
+            $dialogOuter.css('overflow', 'hidden').css('padding', '0').css('margin', '0');
 
-            var dialog = dialogOuter.dialog2(
-                {
-                    title: $btn.attr('title'),
-                    buttons: {
-                        Close: {
-                            click: function () {
-                                options.close();
-                                $(this).dialog2('close');
-                                // If caller has the CSS Class 'reload-on-close' or
-                                // reloadOnClose option is true,
-                                // the main page will be reloaded on close.
-                                if ($btn.hasClass('reload-on-close') || options.reloadOnClose) {
-                                    mainWin.location.reload();
-                                }
+            $dialogOuter.dialog2(
+            {
+                title: $btn.attr('title'),
+                /*buttons: {
+                    Close: {
+                        click: function () {
+                            options.close();
+                            $(this).dialog2('close');
+                            // If caller has the CSS Class 'reload-on-close' or
+                            // reloadOnClose option is true,
+                            // the main page will be reloaded on close.
+                            if ($btn.hasClass('reload-on-close') || options.reloadOnClose) {
+                                mainWin.location.reload();
                             }
                         }
-                    },
-                    autoOpen: true,
-                    closeOnOverlayClick: false,
-                    closeOnEscape: false,
-                    removeOnClose: true,
-                    showCloseHandle: false,
-                    initialLoadText: "Loading..."
-                })
-                .find('iframe').width($('.modal').width() - 20) // Sets the IFrame width to the same as the modal;
+                    }
+                },*/ // TODO: Temporary removal
+                autoOpen: true,
+                closeOnOverlayClick: options.closeOnOverlayClick,
+                closeOnEscape: options.closeOnEscape,
+                removeOnClose: true,
+                showCloseHandle: options.showCloseHandle,
+                initialLoadText: "Loading..."
+            });
+
+            var $dialog = $dialogOuter.parent();
+
+            $dialog.addClass(options.additionalClass);
+
+            // Removes footer if empty
+            $footer = $dialog.find('.modal-footer');
+            console.log($footer.text().length);
+            if ($footer.text().length == 0) {
+                $footer.remove();
+            }
+
+            // Sets the iframe width and height to the same as the modal (must be done at the end)
+            $dialogFrame.width($dialogOuter.width()).height($dialogOuter.height());
         });
     }
 
     $.fn.dialog2IFrame.defaults = {
-        height: 300,
+        additionalClass: "",
         // Appends &iframe=true to URL opened on IFrame
         appendParamUrl: false,
         // Reloads main page when modal is closed
         reloadOnClose: false,
+        closeOnOverlayClick: false,
+        closeOnEscape: false,
+        showCloseHandle: false,
         close: function () {
             return true;
         }