Skip to content

Commit f15e93d

Browse files
jlukicjlukic
committed
Merge pull request #1156 from AnsonT/master
Fixed npm - replaced hidden module with _module variable
2 parents e689a06 + de8089f commit f15e93d

20 files changed

+97
-55
lines changed

‎Gruntfile.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,16 @@ module.exports = function(grunt) {
596596
options: {
597597
patterns: [
598598
{
599-
match: /\$.fn.\w+/g,
600-
replacement: 'module.exports'
599+
match: /\$\.fn\.\w+\s*=\s*function\(parameters\)\s*{/g,
600+
replacement: 'module.exports = function(parameters) {\n var _module = module;\n'
601+
},
602+
{
603+
match: /\$\.fn\.\w+\.settings/g,
604+
replacement: '_module.exports.settings'
605+
},
606+
{
607+
match: /\$\.fn\.\w+\.settings\s*=/g,
608+
replacement: 'module.exports.settings ='
601609
},
602610
{
603611
match: /jQuery/g,

‎npm/modules/accordion.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ($, window, document, undefined) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719

@@ -27,8 +29,8 @@ module.exports = function(parameters) {
2729
.each(function() {
2830
var
2931
settings = ( $.isPlainObject(parameters) )
30-
? $.extend(true, {}, module.exports.settings, parameters)
31-
: $.extend({}, module.exports.settings),
32+
? $.extend(true, {}, _module.exports.settings, parameters)
33+
: $.extend({}, _module.exports.settings),
3234

3335
className = settings.className,
3436
namespace = settings.namespace,

‎npm/modules/behavior/api.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
$.api = module.exports = function(parameters) {
15+
var _module = module;
16+
1517

1618
var
1719
settings = $.extend(true, {}, $.api.settings, parameters),
@@ -524,6 +526,8 @@
524526

525527
// handle DOM attachment to API functionality
526528
module.exports = function(parameters) {
529+
var _module = module;
530+
527531
$(this)
528532
.each(function(){
529533
var
@@ -532,8 +536,8 @@
532536
selector = $(this).selector || '',
533537

534538
settings = ( $.isFunction(parameters) )
535-
? $.extend(true, {}, $.api.settings, module.exports.settings, { stateContext: this, success: parameters })
536-
: $.extend(true, {}, $.api.settings, module.exports.settings, { stateContext: this}, parameters),
539+
? $.extend(true, {}, $.api.settings, _module.exports.settings, { stateContext: this, success: parameters })
540+
: $.extend(true, {}, $.api.settings, _module.exports.settings, { stateContext: this}, parameters),
537541
module
538542
;
539543
module = {

‎npm/modules/behavior/colorize.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
16-
settings = $.extend(true, {}, module.exports.settings, parameters),
18+
settings = $.extend(true, {}, _module.exports.settings, parameters),
1719
// hoist arguments
1820
moduleArguments = arguments || false
1921
;

‎npm/modules/behavior/form.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
;(function ( $, window, document, undefined ) {
1313

14-
module.exports = function(fields, parameters) {
14+
$.fn.form = function(fields, parameters) {
1515
var
1616
$allModules = $(this),
1717

18-
settings = $.extend(true, {}, module.exports.settings, parameters),
19-
validation = $.extend({}, module.exports.settings.defaults, fields),
18+
settings = $.extend(true, {}, _module.exports.settings, parameters),
19+
validation = $.extend({}, _module.exports.settings.defaults, fields),
2020

2121
namespace = settings.namespace,
2222
metadata = settings.metadata,
@@ -282,7 +282,7 @@ module.exports = function(fields, parameters) {
282282
.html(errors[0])
283283
;
284284
if(!promptExists) {
285-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
285+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
286286
module.verbose('Displaying error with css transition', settings.transition);
287287
$prompt.transition(settings.transition + ' in', settings.duration);
288288
}
@@ -318,7 +318,7 @@ module.exports = function(fields, parameters) {
318318
;
319319
if(settings.inline && $prompt.is(':visible')) {
320320
module.verbose('Removing prompt for field', field);
321-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
321+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
322322
$prompt.transition(settings.transition + ' out', settings.duration, function() {
323323
$prompt.remove();
324324
});

‎npm/modules/behavior/state.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
17-
settings = $.extend(true, {}, module.exports.settings, parameters),
19+
settings = $.extend(true, {}, _module.exports.settings, parameters),
1820

1921
moduleSelector = $allModules.selector || '',
2022

‎npm/modules/chatroom.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ($, window, document, undefined) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
moduleSelector = $allModules.selector || '',
@@ -27,7 +29,7 @@ module.exports = function(parameters) {
2729
$(this)
2830
.each(function() {
2931
var
30-
settings = $.extend(true, {}, module.exports.settings, parameters),
32+
settings = $.extend(true, {}, _module.exports.settings, parameters),
3133

3234
className = settings.className,
3335
namespace = settings.namespace,

‎npm/modules/checkbox.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
moduleSelector = $allModules.selector || '',
@@ -28,7 +30,7 @@ module.exports = function(parameters) {
2830
$allModules
2931
.each(function() {
3032
var
31-
settings = $.extend(true, {}, module.exports.settings, parameters),
33+
settings = $.extend(true, {}, _module.exports.settings, parameters),
3234

3335
className = settings.className,
3436
namespace = settings.namespace,

‎npm/modules/dimmer.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719

@@ -29,8 +31,8 @@ module.exports = function(parameters) {
2931
.each(function() {
3032
var
3133
settings = ( $.isPlainObject(parameters) )
32-
? $.extend(true, {}, module.exports.settings, parameters)
33-
: $.extend({}, module.exports.settings),
34+
? $.extend(true, {}, _module.exports.settings, parameters)
35+
: $.extend({}, _module.exports.settings),
3436

3537
selector = settings.selector,
3638
namespace = settings.namespace,
@@ -155,7 +157,7 @@ module.exports = function(parameters) {
155157
: function(){}
156158
;
157159
module.set.dimmed();
158-
if(settings.on != 'hover' && settings.useCSS && module.exports !== undefined && $dimmer.transition('is supported')) {
160+
if(settings.on != 'hover' && settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) {
159161
$dimmer
160162
.transition({
161163
animation : settings.transition + ' in',
@@ -190,7 +192,7 @@ module.exports = function(parameters) {
190192
? callback
191193
: function(){}
192194
;
193-
if(settings.on != 'hover' && settings.useCSS && module.exports !== undefined && $dimmer.transition('is supported')) {
195+
if(settings.on != 'hover' && settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) {
194196
module.verbose('Hiding dimmer with css');
195197
$dimmer
196198
.transition({

‎npm/modules/dropdown.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
;(function ( $, window, document, undefined ) {
1212

1313
module.exports = function(parameters) {
14+
var _module = module;
15+
1416
var
1517
$allModules = $(this),
1618
$document = $(document),
@@ -31,8 +33,8 @@ module.exports = function(parameters) {
3133
.each(function() {
3234
var
3335
settings = ( $.isPlainObject(parameters) )
34-
? $.extend(true, {}, module.exports.settings, parameters)
35-
: $.extend({}, module.exports.settings),
36+
? $.extend(true, {}, _module.exports.settings, parameters)
37+
: $.extend({}, _module.exports.settings),
3638

3739
className = settings.className,
3840
metadata = settings.metadata,
@@ -605,7 +607,7 @@ module.exports = function(parameters) {
605607
if(settings.transition == 'none') {
606608
callback();
607609
}
608-
else if(module.exports !== undefined && $module.transition('is supported')) {
610+
else if($.fn.transition !== undefined && $module.transition('is supported')) {
609611
$currentMenu
610612
.transition({
611613
animation : settings.transition + ' in',
@@ -655,7 +657,7 @@ module.exports = function(parameters) {
655657
callback = callback || function(){};
656658
if(module.is.visible($currentMenu) ) {
657659
module.verbose('Doing menu hide animation', $currentMenu);
658-
if(module.exports !== undefined && $module.transition('is supported')) {
660+
if($.fn.transition !== undefined && $module.transition('is supported')) {
659661
$currentMenu
660662
.transition({
661663
animation : settings.transition + ' out',

‎npm/modules/modal.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ( $, window, document, undefined ) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
$window = $(window),
@@ -39,8 +41,8 @@ module.exports = function(parameters) {
3941
.each(function() {
4042
var
4143
settings = ( $.isPlainObject(parameters) )
42-
? $.extend(true, {}, module.exports.settings, parameters)
43-
: $.extend({}, module.exports.settings),
44+
? $.extend(true, {}, _module.exports.settings, parameters)
45+
: $.extend({}, _module.exports.settings),
4446

4547
selector = settings.selector,
4648
className = settings.className,
@@ -71,7 +73,7 @@ module.exports = function(parameters) {
7173
initialize: function() {
7274
module.verbose('Initializing dimmer', $context);
7375

74-
if(module.exports === undefined) {
76+
if($.fn.dimmer === undefined) {
7577
module.error(error.dimmer);
7678
return;
7779
}
@@ -285,7 +287,7 @@ module.exports = function(parameters) {
285287
callback();
286288
};
287289

288-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
290+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
289291
module.debug('Showing modal with css animations');
290292
$module
291293
.transition(settings.transition + ' in', settings.duration, transitionCallback)
@@ -334,7 +336,7 @@ module.exports = function(parameters) {
334336
;
335337
}
336338
$dimmable.dimmer('hide', function() {
337-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
339+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
338340
$module
339341
.transition('reset')
340342
;
@@ -366,7 +368,7 @@ module.exports = function(parameters) {
366368
callback();
367369
};
368370

369-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
371+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
370372
module.debug('Hiding modal with css animations');
371373
$module
372374
.transition(settings.transition + ' out', settings.duration, transitionCallback)

‎npm/modules/nag.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ($, window, document, undefined) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
moduleSelector = $allModules.selector || '',
@@ -27,7 +29,7 @@ module.exports = function(parameters) {
2729
$(this)
2830
.each(function() {
2931
var
30-
settings = $.extend(true, {}, module.exports.settings, parameters),
32+
settings = $.extend(true, {}, _module.exports.settings, parameters),
3133

3234
className = settings.className,
3335
selector = settings.selector,

‎npm/modules/popup.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ($, window, document, undefined) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
$document = $(document),
@@ -31,8 +33,8 @@ module.exports = function(parameters) {
3133
.each(function() {
3234
var
3335
settings = ( $.isPlainObject(parameters) )
34-
? $.extend(true, {}, module.exports.settings, parameters)
35-
: $.extend({}, module.exports.settings),
36+
? $.extend(true, {}, _module.exports.settings, parameters)
37+
: $.extend({}, _module.exports.settings),
3638

3739
selector = settings.selector,
3840
className = settings.className,
@@ -288,7 +290,7 @@ module.exports = function(parameters) {
288290
$module
289291
.addClass(className.visible)
290292
;
291-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
293+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
292294
$popup
293295
.transition(settings.transition + ' in', settings.duration, function() {
294296
module.bind.close();
@@ -310,7 +312,7 @@ module.exports = function(parameters) {
310312
hide: function(callback) {
311313
callback = callback || function(){};
312314
module.debug('Hiding pop-up');
313-
if(settings.transition && module.exports !== undefined && $module.transition('is supported')) {
315+
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
314316
$popup
315317
.transition(settings.transition + ' out', settings.duration, function() {
316318
module.reset();

‎npm/modules/rating.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;(function ($, window, document, undefined) {
1313

1414
module.exports = function(parameters) {
15+
var _module = module;
16+
1517
var
1618
$allModules = $(this),
1719
moduleSelector = $allModules.selector || '',
@@ -28,8 +30,8 @@ module.exports = function(parameters) {
2830
.each(function() {
2931
var
3032
settings = ( $.isPlainObject(parameters) )
31-
? $.extend(true, {}, module.exports.settings, parameters)
32-
: $.extend({}, module.exports.settings),
33+
? $.extend(true, {}, _module.exports.settings, parameters)
34+
: $.extend({}, _module.exports.settings),
3335

3436
namespace = settings.namespace,
3537
className = settings.className,

‎npm/modules/search.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
;(function ($, window, document, undefined) {
1313

14-
module.exports = function(source, parameters) {
14+
$.fn.search = function(source, parameters) {
1515
var
1616
$allModules = $(this),
1717
moduleSelector = $allModules.selector || '',
@@ -27,7 +27,7 @@ module.exports = function(source, parameters) {
2727
$(this)
2828
.each(function() {
2929
var
30-
settings = $.extend(true, {}, module.exports.settings, parameters),
30+
settings = $.extend(true, {}, _module.exports.settings, parameters),
3131

3232
className = settings.className,
3333
selector = settings.selector,

0 commit comments

Comments
 (0)