[extensions-web] js: $.merge is an array merge, not an object merge

[Jasper St. Pierre <jstpierre src gnome org>]

commit b216768a89a5547818736ae40fe7566fdb2f22c9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Dec 7 10:11:33 2011 -0500

    js: $.merge is an array merge, not an object merge
    
    $.extend is an object merge. This was breaking editing titles, descriptions
    and URLs.

 sweettooth/static/js/main.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/sweettooth/static/js/main.js b/sweettooth/static/js/main.js
index 06e5b6e..cfdf354 100644
--- a/sweettooth/static/js/main.js
+++ b/sweettooth/static/js/main.js
@@ -18,7 +18,7 @@ require(['jquery', 'messages', 'extensions',
                 }
             }
 
-            $elem.editable(url, $.merge(options || {},
+            $elem.editable(url, $.extend(options || {},
                                 { select: true,
                                   ajaxoptions: { error: error, dataType: 'json' },
                                   callback: function(result, settings) {