diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
| commit | 7c222d2418ba44bd4f2f9ffd844f97f43974029a (patch) | |
| tree | a8282098bea1a18312fda510d8f635f3dd97eee1 /node_modules/jquery/src/ajax/var | |
| parent | fc3cc6aee7ce7a28539d332902c0f9923d298c71 (diff) | |
| parent | 3ca0e78b313a1bded021cbb8b2dad241d7cad049 (diff) | |
fixed conflict
Diffstat (limited to 'node_modules/jquery/src/ajax/var')
| -rw-r--r-- | node_modules/jquery/src/ajax/var/location.js | 5 | ||||
| -rw-r--r-- | node_modules/jquery/src/ajax/var/nonce.js | 7 | ||||
| -rw-r--r-- | node_modules/jquery/src/ajax/var/rquery.js | 5 |
3 files changed, 17 insertions, 0 deletions
diff --git a/node_modules/jquery/src/ajax/var/location.js b/node_modules/jquery/src/ajax/var/location.js new file mode 100644 index 0000000..4171d18 --- /dev/null +++ b/node_modules/jquery/src/ajax/var/location.js @@ -0,0 +1,5 @@ +define( function() { + "use strict"; + + return window.location; +} ); diff --git a/node_modules/jquery/src/ajax/var/nonce.js b/node_modules/jquery/src/ajax/var/nonce.js new file mode 100644 index 0000000..6e23708 --- /dev/null +++ b/node_modules/jquery/src/ajax/var/nonce.js @@ -0,0 +1,7 @@ +define( [ + "../../core" +], function( jQuery ) { + "use strict"; + + return jQuery.now(); +} ); diff --git a/node_modules/jquery/src/ajax/var/rquery.js b/node_modules/jquery/src/ajax/var/rquery.js new file mode 100644 index 0000000..06fc374 --- /dev/null +++ b/node_modules/jquery/src/ajax/var/rquery.js @@ -0,0 +1,5 @@ +define( function() { + "use strict"; + + return ( /\?/ ); +} ); |