Skip to content

Commit

Permalink
Merge pull request #121 from szul/master
Browse files Browse the repository at this point in the history
Direct link loading fix
  • Loading branch information
szul authored Mar 26, 2018
2 parents d891d76 + 2de828f commit f0de7ca
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metron",
"version": "2.8.1",
"version": "2.8.2",
"description": "A lightweight library and front-end framework utilizing data attributes",
"main": "dist/gen/metron.js",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metronical.metron",
"version": "2.8.1",
"version": "2.8.2",
"description": "A lightweight library and front-end framework utilizing data attributes",
"main": "dist/gen/metron.js",
"homepage": "https://github.com/metronical/metron",
Expand Down
3 changes: 3 additions & 0 deletions src/metron.framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace metron {
, pivots: {}
, handlers: {}
, hashLoadedFromApplication: false
, firstLoad: false
, requiresDateTimePolyfill: false
};
export function onready(callback: Function, appName?: string) {
Expand Down Expand Up @@ -46,6 +47,7 @@ namespace metron {
}).then((result) => {
if (result != null) {
metron.config = JSON.parse(<string><any>result);
metron.globals.firstLoad = true;
if (callback != null) {
callback(e);
}
Expand All @@ -68,6 +70,7 @@ namespace metron {
});
});
}).then(() => {
metron.globals.firstLoad = true;
if (callback != null) {
callback(e);
}
Expand Down

0 comments on commit f0de7ca

Please sign in to comment.