formize 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/assets/javascripts/formize-dialog.js

@@ -1,20 +1,23 @@
 //= require formize-behave
 
 (function ($) {
+    "use strict";
 
     $.ajaxDialogCount = 0;
 
     $.ajaxDialog = function (url, settings) {
-        var frame_id = "dialog-" + $.ajaxDialogCount, width = $(document).width();
-        var defaultSettings = {
+        var frame_id = "dialog-" + $.ajaxDialogCount, width = $(document).width(), data, defaultSettings;
+        defaultSettings = {
             header: "X-Return-Code",
             width: 0.6,
             height: 0.8
         };
         if (settings === null || settings === undefined) { settings = {}; }
         settings = $.extend({}, defaultSettings, settings);
+	data = settings.data || {};
+	data.dialog = frame_id;
         $.ajax(url, {
-            data: {dialog: frame_id},
+            data: data,
             success: function(data, textStatus, jqXHR) {
                 var frame = $(document.createElement('div')), width, height;
                 frame.attr({id: frame_id, 'class': 'dialog ajax-dialog', style: 'display:none;'});
@@ -46,7 +49,7 @@
                 frame.dialog("open");
             },
             error: function(jqXHR, textStatus, errorThrown) {
-                alert("FAILURE (Error "+textStatus+"): "+errorThrown);
+                alert("FAILURE (Error " + textStatus + "): " + errorThrown);
                 var frame = $("#" + frame_id);
                 frame.dialog("close");
                 frame.remove();                
@@ -56,12 +59,11 @@
     };
 
     $.ajaxDialogInitialize = function(frame) {
-        var frame_id = frame.attr("id");
-        var title = frame.prop("dialogSettings")["title"];
+        var frame_id = frame.attr("id"), title = frame.prop("dialogSettings").title, h1;
         if (title === null || title === undefined) {
-            var h1 = $("#" + frame_id + " h1");
+            h1 = $("#" + frame_id + " h1");
             if (h1[0] !== null && h1[0] !== undefined) {
-                title = h1.text()
+                title = h1.text();
                 h1.remove();
             }
         }
@@ -74,12 +76,12 @@
     };
 
     $.submitAjaxForm = function () {
-        var form = $(this);
-        var frame_id = form.attr('data-dialog');
-        var frame = $('#'+frame_id);
-        var settings = frame.prop("dialogSettings");
+        var form = $(this), frame_id, frame, settings, field;
+        frame_id = form.attr('data-dialog');
+        frame = $('#'+frame_id);
+        settings = frame.prop("dialogSettings");
         
-        var field = $(document.createElement('input'));
+        field = $(document.createElement('input'));
         field.attr({ type: 'hidden', name: 'dialog', value: frame_id });
         form.append(field);
 
@@ -87,10 +89,9 @@
             type: form.attr('method') || 'POST',
             data: form.serialize(),
             success: function(data, textStatus, request) {
-                var returnCode = request.getResponseHeader(settings["header"])
-                var returns = settings["returns"], unknownReturnCode = true;
-                for (var code in returns) {
-                    if (returnCode == code && $.isFunction(returns[code])) {
+                var returnCode = request.getResponseHeader(settings.header), returns = settings.returns, unknownReturnCode = true, code;
+                for (code in returns) {
+                    if (returns.hasOwnProperty(code) && returnCode === code && $.isFunction(returns[code])) {
                         returns[code].call(form, frame, data, textStatus, request);
                         unknownReturnCode = false;
                         $.ajaxDialogInitialize(frame);
@@ -98,19 +99,19 @@
                     }
                 }
                 if (unknownReturnCode) {
-                    if ($.isFunction(settings["defaultReturn"])) {
-                        settings["defaultReturn"].call(form, frame);
+                    if ($.isFunction(settings.defaultReturn)) {
+                        settings.defaultReturn.call(form, frame);
                     } else {
-                        alert("FAILURE (Unknown return code for header " + settings["header"] + "): " + returnCode);
+                        alert("FAILURE (Unknown return code for header " + settings.header + "): " + returnCode);
                     }
                 }
             },
             error: function(jqXHR, textStatus, errorThrown) {
-                alert("FAILURE (Error "+textStatus+"): "+errorThrown);
+                alert("FAILURE (Error " + textStatus + "): " + errorThrown);
                 var frame = $("#" + frame_id);
                 frame.dialog("close");
                 frame.remove();                
-                // if ($.isFunction(settings["error"])) { settings["error"].call(form, frame, jqXHR, textStatus, errorThrown); }
+                // if ($.isFunction(settings.error)) { settings.error.call(form, frame, jqXHR, textStatus, errorThrown); }
             }
         });
         return false;

metadata

@@ -2,7 +2,7 @@
 name: formize
 version: !ruby/object:Gem::Version
   version: !binary |-
-    MS4wLjE=
+    MS4wLjI=
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails