Skip to content

update lodash to same version as current postal #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
corneliusweiss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update lodash to same version as current postal #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div id="msgs"></div>

<script src="../node_modules/babel-core/browser-polyfill.js"></script>
<script src="../node_modules/lodash/index.js"></script>
<script src="../node_modules/lodash/lodash.js"></script>
<script src="../node_modules/jquery/dist/jquery.js"></script>
<script src="../node_modules/postal/lib/postal.js"></script>
<script src="../node_modules/postal.federation/lib/postal.federation.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion example/iframe2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<div id="msgs"></div>
<script src="../node_modules/babel-core/browser-polyfill.js"></script>
<script src="../node_modules/lodash/index.js"></script>
<script src="../node_modules/lodash/lodash.js"></script>
<script src="../node_modules/jquery/dist/jquery.js"></script>
<script src="../node_modules/postal/lib/postal.js"></script>
<script src="../node_modules/postal.federation/lib/postal.federation.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion example/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Playground</title>
<script src="../node_modules/babel-core/browser-polyfill.js"></script>
<script src="../node_modules/lodash/index.js"></script>
<script src="../node_modules/lodash/lodash.js"></script>
<script src="../node_modules/jquery/dist/jquery.js"></script>
<script src="../node_modules/postal/lib/postal.js"></script>
<script src="../node_modules/postal.federation/lib/postal.federation.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion example/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
};
importScripts(
"../node_modules/babel-core/browser-polyfill.js",
"../node_modules/lodash/index.js",
"../node_modules/lodash/lodash.js",
"../node_modules/postal/lib/postal.js",
"../node_modules/postal.federation/lib/postal.federation.js",
"../lib/postal.xframe.js"
Expand Down
2 changes: 1 addition & 1 deletion example/worker2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
};
importScripts(
"../node_modules/babel-core/browser-polyfill.js",
"../node_modules/lodash/index.js",
"../node_modules/lodash/lodash.js",
"../node_modules/postal/lib/postal.js",
"../node_modules/postal.federation/lib/postal.federation.js",
"../lib/postal.xframe.js"
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = function( config ) {
"karma.globals.js",
"node_modules/babel-core/browser-polyfill.js",
"node_modules/jquery/dist/jquery.js",
"node_modules/lodash/index.js",
"node_modules/lodash/lodash.js",
"node_modules/expect.js/expect.js",
"node_modules/mocha/mocha.js",
"node_modules/postal/lib/postal.js",
Expand Down
21 changes: 10 additions & 11 deletions lib/postal.xframe.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/postal.xframe.min.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion lib/postal.xframe.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
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.5.0",
"version": "0.5.1",
"homepage": "http://github.com/postaljs/postal.xframe",
"repository": {
"type": "git",
Expand Down Expand Up @@ -62,11 +62,11 @@
"node": ">=0.4.0"
},
"dependencies": {
"lodash": "3.x",
"postal.federation": ">=0.5.2"
"lodash": "^4.12.0",
"postal.federation": ">=0.5.4"
},
"devDependencies": {
"babel": "5.x",
"babel": "5.x",
"babel-loader": "~4.0.0",
"eslint": "^1.3.1",
"expect.js": "~0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion spec/iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title></title>
<script src="../node_modules/lodash/index.js"></script>
<script src="../node_modules/lodash/lodash.js"></script>
<script src="../node_modules/babel-core/browser-polyfill.js"></script>
<script src="../node_modules/postal/lib/postal.js"></script>
<script src="../node_modules/postal.federation/lib/postal.federation.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion spec/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<body>
<div id="mocha"></div>
<script src="../node_modules/jquery/dist/jquery.js"></script>
<script src="../node_modules/lodash/index.js"></script>
<script src="../node_modules/lodash/lodash.js"></script>
<script src="../node_modules/babel-core/browser-polyfill.js"></script>
<script src="../node_modules/expect.js/expect.js"></script>
<script src="../node_modules/mocha/mocha.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions src/XFrameClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ export default class XFrameClient extends postal.fedx.FederationClient {
const hasDomainFilters = !!state.config.allowedOrigins.length;
return state.config.enabled &&
// another frame/window
( ( this.options.origin === "*" || ( hasDomainFilters && _.contains( state.config.allowedOrigins, this.options.origin ) || !hasDomainFilters ) ) ||
( ( this.options.origin === "*" || ( hasDomainFilters && _.includes( state.config.allowedOrigins, this.options.origin ) || !hasDomainFilters ) ) ||
// worker
( this.options.isWorker && _.contains( state.workers, this.target ) ) ||
( this.options.isWorker && _.includes( state.workers, this.target ) ) ||
// we are in a worker
env.isWorker );
}
Expand Down
Loading