moved variables parse to ajaxify.js

This commit is contained in:
barisusakli
2016-08-26 16:39:03 +03:00
parent b7fbc7a531
commit 5c83075806
4 changed files with 9 additions and 18 deletions

View File

@@ -198,8 +198,6 @@ $(document).ready(function() {
}
var count = 2;
ajaxify.variables.parse();
ajaxify.loadScript(tpl_url, done);
ajaxify.widgets.render(tpl_url, url, done);
@@ -209,6 +207,14 @@ $(document).ready(function() {
app.processPage();
};
ajaxify.parseData = function() {
var dataEl = $('#ajaxify-data');
if (dataEl.length) {
ajaxify.data = JSON.parse(dataEl.text());
dataEl.remove();
}
};
ajaxify.removeRelativePath = function(url) {
if (url.startsWith(RELATIVE_PATH.slice(1))) {
url = url.slice(RELATIVE_PATH.length);

View File

@@ -24,6 +24,7 @@ app.cacheBuster = null;
var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash);
ajaxify.updateHistory(url, true);
ajaxify.parseData();
ajaxify.end(url, app.template);
handleStatusChange();

View File

@@ -1,15 +0,0 @@
"use strict";
/*global ajaxify*/
(function(ajaxify) {
ajaxify.variables = {};
ajaxify.variables.parse = function() {
var dataEl = $('#ajaxify-data');
if (dataEl.length) {
ajaxify.data = JSON.parse(dataEl.text());
dataEl.remove();
}
};
}(ajaxify || {}));

View File

@@ -37,7 +37,6 @@ module.exports = function(Meta) {
'public/src/app.js',
'public/src/ajaxify.js',
'public/src/overrides.js',
'public/src/variables.js',
'public/src/widgets.js'
],