Gadgets/RenderJs: renamed callback and mockup to "after" and "before" (append)

js/plugins/renderjs/renderjs.js

@@ -104,7 +104,7 @@ var RenderJs = (function () {
             });
         },
 
-        setGadgetAndRecurse: function (gadget, data, callback, async) {
+        setGadgetAndRecurse: function (gadget, data, after, before) {
             /*
              * Set gadget data and recursively load it in case it holds another
              * gadgets.
@@ -112,18 +112,18 @@ var RenderJs = (function () {
             // set current gadget as being loaded so gadget instance itself knows which gadget it is
             var self = RenderJs.GadgetIndex.getGadgetById(gadget.attr("id"));
             setSelfGadget(self);
-            // async
-            if (async) {
-              async(data, function(markup){
+            // allow to generate content and enhance before appending!
+            if (before) {
+              before(data, function(markup){
                 gadget.empty().append(markup);
-                if (callback) {
-                  callback(self);
+                if (after) {
+                  after(self);
                 }
               });
             } else {
               gadget.empty().append(data);
-              if (callback) {
-                callback(self);
+              if (after) {
+                after(self);
               }
             }
 
@@ -200,8 +200,8 @@ var RenderJs = (function () {
                             RenderJs.setGadgetAndRecurse(
                               gadget,
                               response.data,
-                              response.callback,
-                              response.mockup
+                              response.after,
+                              response.before
                             );
                             RenderJs.checkAndTriggerReady();
                             RenderJs.updateGadgetData(gadget);
@@ -260,8 +260,8 @@ var RenderJs = (function () {
                       RenderJs.setGadgetAndRecurse(
                         gadget,
                         response.data,
-                        response.callback,
-                        response.mockup
+                        response.after,
+                        response.before
                       );
                       RenderJs.checkAndTriggerReady();
                       RenderJs.updateGadgetData(gadget);

modules/ui/address/address.js

@@ -8,7 +8,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/basket/basket.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/browser/browser.js

@@ -120,7 +120,7 @@ define([
     };
 
     that.data = source;
-    that.mockup = function (source, callback_mockup) {
+    that.before = function (source, callback_mockup) {
       var spec = {};
 
       spec.gadget = RenderJs.getSelfGadget();
@@ -148,7 +148,7 @@ define([
       }
     };
 
-    that.callback = function (self) {
+    that.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/confirm/confirm.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/description/description.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/details/details.js

@@ -4,10 +4,12 @@ define([
   , 'css!details'
   ],
   function (App, source) {
-    var response = {};
+    var that = {};
+    var priv = {};
 
-    response.data = source;
-    response.callback = function (self) {
+    that.data = source;
+
+    that.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 
@@ -25,6 +27,6 @@ define([
     };
 
   // return response object
-  return response;
+  return that;
   }
 );

modules/ui/footer/footer.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/gallery/gallery.js

@@ -188,7 +188,7 @@ define([
 
     // response object
     that.data = source;
-    that.mockup = function (source, callback_mockup) {
+    that.before = function (source, callback_mockup) {
       var spec = {};
 
       spec.gadget = RenderJs.getSelfGadget();
@@ -227,7 +227,7 @@ define([
       }
     };
 
-    that.callback = function (self) {
+    that.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/header/header.js

@@ -7,7 +7,7 @@ define([
     var response = {}, def;
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       // TODO: this should be inside renderJs, although its application-specific
       // but the problem with using async-render-require will be everything
       // being loaded at the same time, so the user should have the opportunity

modules/ui/index/index.js

@@ -7,7 +7,7 @@ define([
     var response = {}, def;
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/item/item.js

@@ -170,7 +170,7 @@ define([
 
     // response object
     that.data = source;
-    that.mockup = function (source, callback_mockup) {
+    that.before = function (source, callback_mockup) {
       var spec = {};
 
       spec.gadget = RenderJs.getSelfGadget();
@@ -209,7 +209,7 @@ define([
       }
     };
 
-    that.callback = function (self) {
+    that.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/items/items.js

@@ -96,7 +96,7 @@ define([
 
     // response object
     that.data = source;
-    that.mockup = function (source, callback_mockup) {
+    that.before = function (source, callback_mockup) {
       var spec = {};
 
       spec.gadget = RenderJs.getSelfGadget();
@@ -124,7 +124,7 @@ define([
       }
     };
 
-    that.callback = function (self) {
+    that.after = function (self) {
       // set binding for opening a detailed view
       // TODO: this should also be a link-method call
       self.dom.find("ul").on("click", "a", function (e) {

modules/ui/login/login.js

@@ -8,7 +8,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/media/media.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/payment/payment.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/products/products.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/refine/refine.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/register/register.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/searchbar/searchbar.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       var filter = self.dom.find(".searchbar_filter"),
         value, runSearch;
 

modules/ui/seo/seo.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/shipment/shipment.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/sorting/sorting.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/summary/summary.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/teaser/teaser.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/terms/terms.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
       if (App === undefined) {
         def = new $.Deferred;
 

modules/ui/translate/translate.js

@@ -7,7 +7,7 @@ define([
     var response = {};
 
     response.data = source;
-    response.callback = function (self) {
+    response.after = function (self) {
 
       var that = {};
       var priv = {};