Skip to content

Commit

Permalink
fixed safari issue, prepped for v0.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ifandelse committed Dec 5, 2014
1 parent 0743508 commit fefbca3
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 30 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# postal.xframe

## Version 0.3.1 (Dual Licensed [MIT](http://www.opensource.org/licenses/mit-license) & [GPL](http://www.opensource.org/licenses/gpl-license))
## Version 0.3.2 (Dual Licensed [MIT](http://www.opensource.org/licenses/mit-license) & [GPL](http://www.opensource.org/licenses/gpl-license))

*(special thanks to @rbtbar for the IE 10/11 fixes where iframes aren't reporting a host or protocol)*

Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "postal.xframe",
"version": "0.3.1",
"version": "0.3.2",
"description": "postal.js/postal.federation plugin for federating instances of postal.js across iframe/window boundaries.",
"homepage": "https://github.com/postaljs/postal.xframe",
"keywords": [
Expand Down Expand Up @@ -29,7 +29,7 @@
"mocha": "~1.17.0",
"requirejs": "~2.1.10",
"postal.diagnostics": "~0.7.0",
"postal.js": "~0.11.0",
"postal.js": "~0.11.2",
"postal.federation": ">=0.2.4",
"riveter": "~0.1.2",
"lodash": "~2.4.1"
Expand Down
5 changes: 4 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
##v0.3.2
* Fixed a bug where cross frame publishing failed in Safari due to postMessage.apply failing silently.

##v0.3.0-rc1

* CommonJS module wrapper now returns a factory function, to which you need to pass a postal instance (ideally, you can pass the output of the postal.federation module since it returns postal, but passing postal will work as well as long as postal.federation has been loaded prior).
* CommonJS module wrapper now returns a factory function, to which you need to pass a postal instance (ideally, you can pass the output of the postal.federation module since it returns postal, but passing postal will work as well as long as postal.federation has been loaded prior).
4 changes: 2 additions & 2 deletions component.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "postal.xframe",
"version": "0.3.1",
"version": "0.3.2",
"main": ["lib/postal.xframe.js"],
"dependencies": {
"lodash": "~2.4.1",
"postal.js": "~0.11.0",
"postal.js": "~0.11.2",
"postal.federation": "~0.2.4"
}
}
5 changes: 0 additions & 5 deletions example/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
<script type="text/javascript" src="../bower/postal.request-response/lib/postal.request-response.js"></script>
<script type="text/javascript" src="../lib/postal.xframe.js"></script>
<script type="text/javascript">
window.addEventListener("message", function(e) {
console.log("------- IFRAME1 -------");
console.log(e.data);
console.log("------ /IFRAME1 -------");
});
// We need to tell postal how to get a deferred instance
postal.configuration.promise.createDeferred = function() {
return new $.Deferred();
Expand Down
5 changes: 0 additions & 5 deletions example/iframe2.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<script type="text/javascript" src="../bower/postal.request-response/lib/postal.request-response.js"></script>
<script type="text/javascript" src="../lib/postal.xframe.js"></script>
<script type="text/javascript">
window.addEventListener("message", function(e) {
console.log("------- IFRAME2 -------");
console.log(e.data);
console.log("------ /IFRAME2 -------");
});
// We need to tell postal how to get a deferred instance
postal.configuration.promise.createDeferred = function() {
return new $.Deferred();
Expand Down
5 changes: 0 additions & 5 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
</div>
<div id="msgs"></div>
<script type="text/javascript">
window.addEventListener("message", function(e) {
console.log("------- PARENT -------");
console.log(e.data);
console.log("------ /PARENT -------");
});
postal.fedx.signalReady();
</script>
</body>
Expand Down
4 changes: 1 addition & 3 deletions lib/postal.xframe.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* postal.xframe - postal.js/postal.federation plugin for federating instances of postal.js across iframe/window boundaries.
* Author: Jim Cowart (http://freshbrewedcode.com/jimcowart)
* Version: v0.3.1
* Version: v0.3.2
* Url: http://github.com/postaljs/postal.xframe
* License(s): MIT, GPL
*/
Expand Down Expand Up @@ -49,8 +49,6 @@
// return trip. We stowed away aboard a freighter headed back to the
// US and by the time we got back, no one had heard of IE 8 or 9. True story.
var useEagerSerialize = /MSIE [8,9]/.test(navigator.userAgent);
// Hack for testing IE subwindows (https://github.com/Nemo157)
var noPostMessageApply = /Trident/.test(navigator.userAgent);
var _memoRemoteByInstanceId = function (memo, instanceId) {
var proxy = _.find(this.remotes, function (x) {
return x.instanceId === instanceId;
Expand Down
4 changes: 2 additions & 2 deletions lib/postal.xframe.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "postal.xframe",
"description": "postal.js/postal.federation plugin for federating instances of postal.js across iframe/window boundaries.",
"version": "0.3.1",
"version": "0.3.2",
"homepage": "http://github.com/postaljs/postal.xframe",
"repository": {
"type": "git",
Expand Down Expand Up @@ -54,7 +54,7 @@
"devDependencies": {
"bower": "~1.2.8",
"gulp-util": "~2.2.9",
"gulp": "~3.3.1",
"gulp": "~3.8.10",
"gulp-imports": "~0.0.1",
"gulp-header": "~1.0.2",
"gulp-hint-not": "~0.0.3",
Expand Down
2 changes: 0 additions & 2 deletions src/xframe.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ function safeSerialize( envelope ) {
// return trip. We stowed away aboard a freighter headed back to the
// US and by the time we got back, no one had heard of IE 8 or 9. True story.
var useEagerSerialize = /MSIE [8,9]/.test( navigator.userAgent );
// Hack for testing IE subwindows (https://github.com/Nemo157)
var noPostMessageApply = /Trident/.test( navigator.userAgent );

var _memoRemoteByInstanceId = function( memo, instanceId ) {
var proxy = _.find( this.remotes, function( x ) {
Expand Down

0 comments on commit fefbca3

Please sign in to comment.