Merge branch 'master' into development

Conflicts: publish/adapter.debug.js publish/adapter.min.js publish/adapter.screenshare.js publish/adapter.screenshare.min.js
Temasys · Mar 18, 2016 · 23e185b · 23e185b
2 parents 4c9ad28 + b5d2d30
commit 23e185b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/publish/adapter.debug.js b/publish/adapter.debug.js
@@ -316,6 +316,7 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
 
   var w = window;
   var i = document.createElement('iframe');
+  i.name = 'adapterjs-alert';
   i.style.position = 'fixed';
   i.style.top = '-41px';
   i.style.left = 0;

diff --git a/publish/adapter.min.js b/publish/adapter.min.js
diff --git a/publish/adapter.screenshare.js b/publish/adapter.screenshare.js
@@ -316,6 +316,7 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
 
   var w = window;
   var i = document.createElement('iframe');
+  i.name = 'adapterjs-alert';
   i.style.position = 'fixed';
   i.style.top = '-41px';
   i.style.left = 0;

diff --git a/publish/adapter.screenshare.min.js b/publish/adapter.screenshare.min.js
diff --git a/source/adapter.js b/source/adapter.js
@@ -299,6 +299,7 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
 
   var w = window;
   var i = document.createElement('iframe');
+  i.name = 'adapterjs-alert';
   i.style.position = 'fixed';
   i.style.top = '-41px';
   i.style.left = 0;