Prechádzať zdrojové kódy

Better handle AMD across files

Now that `define` and `require` are never made public, we have to
build everything to support `$.fn.select2.amd` while also working
with other AMD loaders.
Kevin Brown 10 rokov pred
rodič
commit
65875bf8e7

+ 2 - 2
dist/js/select2.amd.full.js

@@ -1,4 +1,4 @@
-(function() {define('select2/utils',[], function () {
+(function() { if ($ && $.fn && $.fn.select2 && $.fn.select2.amd) { define = $.fn.select2.amd.define; require = $.fn.select2.amd.require; }define('select2/utils',[], function () {
   var Utils = {};
 
   Utils.Extend = function (ChildClass, SuperClass) {
@@ -1674,4 +1674,4 @@ define('jquery.select2',[
   return Select2;
 });
 
-require('jquery.select2'); $.Select2 = $.Select2 || {}; $.Select2.amd = { define: define };}());
+require('jquery.select2'); $.fn.select2.amd = { define: define, require: require };}());

+ 2 - 2
dist/js/select2.amd.js

@@ -1,4 +1,4 @@
-(function() {define('select2/utils',[], function () {
+(function() { if ($ && $.fn && $.fn.select2 && $.fn.select2.amd) { define = $.fn.select2.amd.define; require = $.fn.select2.amd.require; }define('select2/utils',[], function () {
   var Utils = {};
 
   Utils.Extend = function (ChildClass, SuperClass) {
@@ -1674,4 +1674,4 @@ define('jquery.select2',[
   return Select2;
 });
 
-require('jquery.select2'); $.Select2 = $.Select2 || {}; $.Select2.amd = { define: define };}());
+require('jquery.select2'); $.fn.select2.amd = { define: define, require: require };}());

+ 2 - 2
dist/js/select2.full.js

@@ -1,4 +1,4 @@
-(function() {/**
+(function() { if ($ && $.fn && $.fn.select2 && $.fn.select2.amd) { define = $.fn.select2.amd.define; require = $.fn.select2.amd.require; }/**
  * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
@@ -11209,4 +11209,4 @@ define('jquery.select2',[
   return Select2;
 });
 
-require('jquery.select2'); $.Select2 = $.Select2 || {}; $.Select2.amd = { define: define };}());
+require('jquery.select2'); $.fn.select2.amd = { define: define, require: require };}());

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/select2.full.min.js


+ 2 - 2
dist/js/select2.js

@@ -1,4 +1,4 @@
-(function() {/**
+(function() { if ($ && $.fn && $.fn.select2 && $.fn.select2.amd) { define = $.fn.select2.amd.define; require = $.fn.select2.amd.require; }/**
  * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
@@ -2102,4 +2102,4 @@ define('jquery.select2',[
   return Select2;
 });
 
-require('jquery.select2'); $.Select2 = $.Select2 || {}; $.Select2.amd = { define: define };}());
+require('jquery.select2'); $.fn.select2.amd = { define: define, require: require };}());

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/select2.min.js


+ 1 - 1
docs/examples.html

@@ -372,7 +372,7 @@ $("[data-fill-from]").each(function () {
 
 prettyPrint();
 
-require(["select2/core", "select2/utils"], function (Select2, Utils) {
+$.fn.select2.amd.require(["select2/core", "select2/utils"], function (Select2, Utils) {
   var $basicSingle = $(".js-example-basic-single");
   var $basicMultiple = $(".js-example-basic-multiple");
 

+ 2 - 2
src/js/banner.json

@@ -1,4 +1,4 @@
 {
-  "start": "(function() {",
-  "end": "require('jquery.select2'); $.Select2 = $.Select2 || {}; $.Select2.amd = { define: define, require: require };}());"
+  "start": "(function() { if ($ && $.fn && $.fn.select2 && $.fn.select2.amd) { define = $.fn.select2.amd.define; require = $.fn.select2.amd.require; }",
+  "end": "require('jquery.select2'); $.fn.select2.amd = { define: define, require: require };}());"
 }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov