From 3984055c100eac90e8d3ef165477d50d04b68b69 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Jul 2019 17:00:40 -0400 Subject: [PATCH] Adding declarations so Alpaca is never referenced out of scope This will allow Alpaca to be used in environments with stricter evaluation --- config/umd-wrapper.txt | 2 ++ src/js/AbstractTemplateEngine.js | 2 ++ src/js/Alpaca-async.js | 6 ++++-- src/js/HandlebarsTemplateEngine.js | 2 ++ src/js/TemplateEngineRegistry.js | 6 ++++-- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/config/umd-wrapper.txt b/config/umd-wrapper.txt index eca25d403..0005762df 100644 --- a/config/umd-wrapper.txt +++ b/config/umd-wrapper.txt @@ -35,6 +35,7 @@ var depNames = deps ? _.pluck(deps, 'paramName') : stdDeps; <% if (exports) { %> <%= contents %> <% if (typeof defaultView != 'undefined') { %> + var <%= exports %> = $.alpaca; <%= exports %>.defaultView = '<%= defaultView %>'; <% } %> return <%= exports %>; @@ -44,6 +45,7 @@ var depNames = deps ? _.pluck(deps, 'paramName') : stdDeps; <%= contents %> })(); <% if (typeof defaultView != 'undefined') { %> + var <%= exports %> = $.alpaca; exports.defaultView = '<%= defaultView %>'; <% } %> return exports; diff --git a/src/js/AbstractTemplateEngine.js b/src/js/AbstractTemplateEngine.js index 4e1d1df58..e52adc799 100644 --- a/src/js/AbstractTemplateEngine.js +++ b/src/js/AbstractTemplateEngine.js @@ -1,5 +1,7 @@ (function($) { + var Alpaca = $.alpaca; + Alpaca.AbstractTemplateEngine = Base.extend( { constructor: function(id) diff --git a/src/js/Alpaca-async.js b/src/js/Alpaca-async.js index cf1ea2285..472c5e993 100644 --- a/src/js/Alpaca-async.js +++ b/src/js/Alpaca-async.js @@ -14,10 +14,12 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////// -(function() { +(function($) { //'use strict'; + + var Alpaca = $.alpaca; var async = {}; Alpaca.series = Alpaca.serial = function(funcs, callback) @@ -4675,4 +4677,4 @@ exports.during = whilst$1; exports.doDuring = doWhilst$1; -})(); \ No newline at end of file +})(jQuery); diff --git a/src/js/HandlebarsTemplateEngine.js b/src/js/HandlebarsTemplateEngine.js index e2e95a43a..f7733d67b 100644 --- a/src/js/HandlebarsTemplateEngine.js +++ b/src/js/HandlebarsTemplateEngine.js @@ -1,5 +1,7 @@ (function($, Handlebars, HandlebarsPrecompiled) { + var Alpaca = $.alpaca; + // runtime cache of precompiled templates keyed by cacheKey var COMPILED_TEMPLATES = {}; diff --git a/src/js/TemplateEngineRegistry.js b/src/js/TemplateEngineRegistry.js index d93fc059d..60468fe3c 100644 --- a/src/js/TemplateEngineRegistry.js +++ b/src/js/TemplateEngineRegistry.js @@ -1,5 +1,7 @@ -(function() +(function($) { + var Alpaca = $.alpaca; + Alpaca.TemplateEngineRegistry = (function() { var registry = {}; @@ -55,4 +57,4 @@ }; })(); -})(); +})(jQuery);