Combined domTargetResolver and targetSelector into target on the opti…

…ons hash
ifandelse · Nov 30, 2011 · e3e19c8 · e3e19c8
1 parent 09b0e05
commit e3e19c8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/examples/loading/main.js b/examples/loading/main.js
@@ -24,7 +24,7 @@ $(function(){
             return $.tmpl(template, model);
         };
         infuser.infuse("Example", {
-            targetSelector: "#target",
+            target: "#target",
             render: function(target, template) {
                 // really ugly way to simulate long running template retrieval
                 setTimeout(function() { origRender(target, template); }, 4000);

diff --git a/examples/shorthand/main.js b/examples/shorthand/main.js
@@ -26,7 +26,7 @@ $(function(){
 
     $('#btnPlain').click(function(){
         // Shorthand syntax allows you to retrieve the template, and attach to target DOM element all in one call
-        infuser.infuse("HelloWorld", { postRender: togglePlain, targetSelector: "#targetPlain" });
+        infuser.infuse("HelloWorld", { postRender: togglePlain, target: "#targetPlain" });
     });
 
     $('#btnFancy').click(function(){
@@ -35,7 +35,7 @@ $(function(){
             .infuse(
                 "Example",
                 {
-                    targetSelector: "#targetFancy",
+                    target: "#targetFancy",
                     model: model,
                     preRender: function(target, template) { $(target).children().remove().end().fadeOut().hide(); },
                     render:    function(target, template) { $(target).append(template).slideDown('slow'); },

diff --git a/examples/trafficcop/main.js b/examples/trafficcop/main.js
@@ -3,7 +3,7 @@ var toggled = false,
         infuser.infuse(
             "Example",
             {
-                targetSelector: "#target",
+                target: "#target",
                 model: menus[modelNum],
                 render: function(target, template) {
                     $(target).append(template).slideDown('slow');

diff --git a/examples/underscore/main.js b/examples/underscore/main.js
@@ -29,7 +29,7 @@ $(function(){
         };
         infuser.infuse("Example", {
             model: model,
-            targetSelector: "#target",
+            target: "#target",
             postRender: function(target) {
                 if(!toggled) {
                     $("#msg").text("The next click will use the locally cached template");

diff --git a/lib/infuser.js b/lib/infuser.js
@@ -88,7 +88,7 @@ var infuser = {
     },
 
     defaults: {
-        domTargetResolver:  function(templateId) { return "#" + templateId }, // DEFAULT MAPPING
+        target:  function(templateId) { return "#" + templateId }, // DEFAULT MAPPING
         loadingTemplate:    {
                                 content:        '<div class="infuser-loading">Loading...</div>',
                                 transitionIn:   function(target) {
@@ -174,7 +174,7 @@ var infuser = {
     infuse: function(templateId, renderOptions) {
         var self = this,
             options = $.extend({}, self.defaults, renderOptions),
-            targetElement = options.targetSelector || options.domTargetResolver(templateId);
+            targetElement = typeof options.target === 'function' ? options.target(templateId) : options.target;
         if(options.useLoadingTemplate) {
             options.loadingTemplate.transitionIn(targetElement);
         }

diff --git a/lib/infuser.min.gz.js b/lib/infuser.min.gz.js
diff --git a/lib/infuser.min.js b/lib/infuser.min.js
diff --git a/src/Api.js b/src/Api.js
@@ -13,7 +13,7 @@ var infuser = {
     },
 
     defaults: {
-        domTargetResolver:  function(templateId) { return "#" + templateId }, // DEFAULT MAPPING
+        target:  function(templateId) { return "#" + templateId }, // DEFAULT MAPPING
         loadingTemplate:    {
                                 content:        '<div class="infuser-loading">Loading...</div>',
                                 transitionIn:   function(target) {
@@ -99,7 +99,7 @@ var infuser = {
     infuse: function(templateId, renderOptions) {
         var self = this,
             options = $.extend({}, self.defaults, renderOptions),
-            targetElement = options.targetSelector || options.domTargetResolver(templateId);
+            targetElement = typeof options.target === 'function' ? options.target(templateId) : options.target;
         if(options.useLoadingTemplate) {
             options.loadingTemplate.transitionIn(targetElement);
         }