sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/crunchbutton/crunchbutton

Browse Source
This commit is contained in:
Daniel Camargo 2014-04-09 13:50:31 -03:00
commit 761197d560
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/views/default/crunchbutton/layout/html.bottom.phtml
View File

@ -17,12 +17,6 @@ if ($this->community) {
?>
<script type="text/javascript">
if (top.frames.length != 0 || window != top || top.location != location) {
top.location.href = location.href;
top.location = self.document.location;
}
</script>
<script type="text/javascript">
var c = <?=json_encode(c::appConfig())?>;

10
www/assets/js/app.js
View File

@ -6,6 +6,14 @@
* @date: 2012-06-20
*
*/
if (top.frames.length != 0 || window != top || top.location != location) {
top.location.href = location.href;
top.location = self.document.location;
var REDIRECT = true;
}
var App = {
tagline: '',
service: '/api/',
@ -662,7 +670,7 @@ App.processConfig = function(json, user) {
*/
App.init = function(config) {
// ensure this function cant be called twice. can crash the browser if it does.
if (App._init) {
if (App._init || REDIRECT) {
return;
}