Selaa lähdekoodia

Relative paths for require

Now we can use relative paths in the calls to `require`, so those
using relative builds don't have to worry about modules not being
imported properly. This also makes it considerably easier in the
future when we look to cut down the build sizes and have a custom
builder, as we don't have to worry as much about the paths being
incorrect.

This fixes https://github.com/select2/select2/issues/3014 finally.
Kevin Brown 10 vuotta sitten
vanhempi
commit
7e4e8bc9d6

+ 6 - 3
dist/js/select2.full.js

@@ -4200,6 +4200,7 @@ S2.define('select2/i18n/en',[],function () {
 
 S2.define('select2/defaults',[
   'jquery',
+  'require',
   './results',
 
   './selection/single',
@@ -4232,7 +4233,9 @@ S2.define('select2/defaults',[
   './dropdown/closeOnSelect',
 
   './i18n/en'
-], function ($, ResultsList,
+], function ($, require,
+
+             ResultsList,
 
              SingleSelection, MultipleSelection, Placeholder, AllowClear,
              SelectionSearch, EventRelay,
@@ -4515,8 +4518,8 @@ S2.define('select2/defaults',[
     }
 
     this.defaults = {
-      amdBase: 'select2/',
-      amdLanguageBase: 'select2/i18n/',
+      amdBase: './',
+      amdLanguageBase: './i18n/',
       closeOnSelect: true,
       debug: false,
       escapeMarkup: Utils.escapeMarkup,

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/select2.full.min.js


+ 6 - 3
dist/js/select2.js

@@ -4200,6 +4200,7 @@ S2.define('select2/i18n/en',[],function () {
 
 S2.define('select2/defaults',[
   'jquery',
+  'require',
   './results',
 
   './selection/single',
@@ -4232,7 +4233,9 @@ S2.define('select2/defaults',[
   './dropdown/closeOnSelect',
 
   './i18n/en'
-], function ($, ResultsList,
+], function ($, require,
+
+             ResultsList,
 
              SingleSelection, MultipleSelection, Placeholder, AllowClear,
              SelectionSearch, EventRelay,
@@ -4515,8 +4518,8 @@ S2.define('select2/defaults',[
     }
 
     this.defaults = {
-      amdBase: 'select2/',
-      amdLanguageBase: 'select2/i18n/',
+      amdBase: './',
+      amdLanguageBase: './i18n/',
       closeOnSelect: true,
       debug: false,
       escapeMarkup: Utils.escapeMarkup,

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/js/select2.min.js


+ 7 - 3
src/js/select2/defaults.js

@@ -1,5 +1,7 @@
 define([
   'jquery',
+  'require',
+
   './results',
 
   './selection/single',
@@ -32,7 +34,9 @@ define([
   './dropdown/closeOnSelect',
 
   './i18n/en'
-], function ($, ResultsList,
+], function ($, require,
+
+             ResultsList,
 
              SingleSelection, MultipleSelection, Placeholder, AllowClear,
              SelectionSearch, EventRelay,
@@ -315,8 +319,8 @@ define([
     }
 
     this.defaults = {
-      amdBase: 'select2/',
-      amdLanguageBase: 'select2/i18n/',
+      amdBase: './',
+      amdLanguageBase: './i18n/',
       closeOnSelect: true,
       debug: false,
       escapeMarkup: Utils.escapeMarkup,

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä