Version 4.7.8
This commit is contained in:
1 parent
7b7404e741
commit
fd22d99e69
688 files changed
+19814
-10890
No files matched your search
@@ -230,6 +230,11 @@ class _Output
|
||||
* @brief pageName for data-pageName in the <body> tag
|
||||
*/
|
||||
public $pageName = NULL;
|
||||
|
||||
/**
|
||||
* @brief Data which were loaded via the GraphQL framework, but which have to be immediately available, rather then via later AJAX requests
|
||||
*/
|
||||
public $graphData = [];
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
@@ -259,12 +264,32 @@ class _Output
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a JS bundle and add the files to the output. This greatly cleans up the usage from outside of the Output class
|
||||
*
|
||||
* @par JS Bundle Filename Cheatsheet
|
||||
* @li library.js (this is jQuery, mustache, underscore, jstz, etc)
|
||||
* @li framework.js (this is ui/, utils/*, ips.model.js, ips.controller.js and the editor controllers)
|
||||
* @li admin.js or front.js (these are controllers, templates and models which are used everywhere for that location)
|
||||
* @li app.js (this is all models for a single application)
|
||||
* @li {location}_{section}.js (this is all controllers and templates for this section called ad-hoc when needed)
|
||||
*
|
||||
* @param string $file Filename
|
||||
* @param string|null $app Application
|
||||
* @param string|null $location Location (e.g. 'admin', 'front')
|
||||
* @return array URL to JS files
|
||||
*/
|
||||
public function addJsFiles( $file, $app=NULL, $location=NULL )
|
||||
{
|
||||
$this->jsFiles = array_merge( $this->jsFiles, $this->js( $file, $app, $location ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a JS bundle
|
||||
*
|
||||
* @par JS Bundle Cheatsheet
|
||||
* @li library.js (this is jQuery, mustache, underscore, jstz, etc)
|
||||
* @li library.js (this is jQuery, mustache, underscore etc)
|
||||
* @li framework.js (this is ui/, utils/*, ips.model.js, ips.controller.js and the editor controllers)
|
||||
* @li admin.js or front.js (these are controllers, templates and models which are used everywhere for that location)
|
||||
* @li app.js (this is all models for a single application)
|
||||
@@ -808,6 +833,11 @@ class _Output
|
||||
exit;
|
||||
}
|
||||
|
||||
if ( \defined('LIVE_TOPICS_DEV') AND \LIVE_TOPICS_DEV )
|
||||
{
|
||||
$httpHeaders['Access-Control-Allow-Origin'] = '*';
|
||||
}
|
||||
|
||||
/* Cache session Data Layer events */
|
||||
if ( !( $httpStatusCode === 200 AND !\IPS\Request::i()->isAjax() AND $contentType == 'text/html' ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user