Only generate result ids when the container has an id

kevin-brown · kevin-brown · commit 72ae0da8799e · 2014-10-21T21:44:00.000-04:00
diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js
@@ -998,7 +998,7 @@ define('select2/data/select',[
         data.children = children;
       }
 
-      if (data.id) {
+      if (data.id && this.container != null) {
         data._resultId = this.generateResultId(this.container, data);
       }
 
diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js
@@ -998,7 +998,7 @@ define('select2/data/select',[
         data.children = children;
       }
 
-      if (data.id) {
+      if (data.id && this.container != null) {
         data._resultId = this.generateResultId(this.container, data);
       }
 
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -10536,7 +10536,7 @@ define('select2/data/select',[
         data.children = children;
       }
 
-      if (data.id) {
+      if (data.id && this.container != null) {
         data._resultId = this.generateResultId(this.container, data);
       }
 
diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js
diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -1427,7 +1427,7 @@ define('select2/data/select',[
         data.children = children;
       }
 
-      if (data.id) {
+      if (data.id && this.container != null) {
         data._resultId = this.generateResultId(this.container, data);
       }
 
diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/src/js/select2/data/select.js b/src/js/select2/data/select.js
@@ -148,7 +148,7 @@ define([
         data.children = children;
       }
 
-      if (data.id) {
+      if (data.id && this.container != null) {
         data._resultId = this.generateResultId(this.container, data);
       }
 

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,7 @@ define('select2/data/select',[`
`998`	`998`	`data.children = children;`
`999`	`999`	`}`
`1000`	`1000`
`1001`		`- if (data.id) {`
	`1001`	`+ if (data.id && this.container != null) {`
`1002`	`1002`	`data._resultId = this.generateResultId(this.container, data);`
`1003`	`1003`	`}`
`1004`	`1004`
Original file line number	Diff line number	Diff line change
`@@ -10536,7 +10536,7 @@ define('select2/data/select',[`
`10536`	`10536`	`data.children = children;`
`10537`	`10537`	`}`
`10538`	`10538`
`10539`		`- if (data.id) {`
	`10539`	`+ if (data.id && this.container != null) {`
`10540`	`10540`	`data._resultId = this.generateResultId(this.container, data);`
`10541`	`10541`	`}`
`10542`	`10542`
Original file line number	Diff line number	Diff line change
`@@ -1427,7 +1427,7 @@ define('select2/data/select',[`
`1427`	`1427`	`data.children = children;`
`1428`	`1428`	`}`
`1429`	`1429`
`1430`		`- if (data.id) {`
	`1430`	`+ if (data.id && this.container != null) {`
`1431`	`1431`	`data._resultId = this.generateResultId(this.container, data);`
`1432`	`1432`	`}`
`1433`	`1433`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ define([`
`148`	`148`	`data.children = children;`
`149`	`149`	`}`
`150`	`150`
`151`		`- if (data.id) {`
	`151`	`+ if (data.id && this.container != null) {`
`152`	`152`	`data._resultId = this.generateResultId(this.container, data);`
`153`	`153`	`}`
`154`	`154`