"type" should be calculated in DecoRegistry

plone/app/deco/browser/config.py

@@ -13,13 +13,14 @@
 
 class DecoConfigView(BrowserView):
 
-    def obtain_type(self):
+    # TODO: this should move to DecoRegistry
+    def _type(self):
         """ Obtains the type of the context object or of the object we are
             adding.
         """
 
-        if 'type' in self.request.form:
-            return self.request.form['type']
+        if '++add++' in self.request.getURL():
+            return self.request.getURL().split('++add++')[1]
 
         else:
             if hasattr(self.context, 'portal_type'):
@@ -31,7 +32,7 @@ def obtain_type(self):
     def config(self):
         registry = IDecoRegistry(getUtility(IRegistry))
         config = registry(**{
-            'type': self.obtain_type(),
+            'type': self.type(),
             'context': self.context,
             'request': self.request,
             })

plone/app/deco/resources/js/deco.core.js

@@ -78,25 +78,10 @@ immed: true, strict: true, maxlen: 80, maxerr: 9999 */
         // Set document
         $.deco.document = window.parent.document;
 
-        // Get the url of the page
-        var match = $.deco.options.url.match(/^([\w#!:.?+=&%@!\-\/]+)\/edit$/);
-        if (match) {
-            $.deco.options.url = match[1];
-        }
-
-        // Chop add
-        match = $.deco.options.url.match(/^([\w#:.?=%@!\-\/]+)\/\+\+add\+\+([\w#!:.?+=&%@!\-\/]+)$/);
-        if (match) {
-            $.deco.options.url = match[1];
-            $.deco.options.type = match[2];
-            $.deco.options.ignore_context = true;
-        }
-
         // Get the configuration from the backend
         $.ajax({
             type: "GET",
-            url: $.deco.options.url + "/@@deco-config" +
-                ($.deco.options.type === '' ? '' : "?type=" + $.deco.options.type),
+            url: $.deco.options.url + "/@@deco-config",
             success: function (configdata) {
 
                 // Add global options