Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #168 from radiorabe/feature/use-global-angular-install-and-not-cdn

Browse source 
Use the minimized angular from public dir instead of cdn
This commit is contained in:
Robb 2017-04-28 19:58:20 -04:00 • committed by GitHub
commit 2b30a14744
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/EmbedController.php
View file

@ -90,6 +90,7 @@ class EmbedController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$this->view->angular = Application_Common_HTTPHelper::getStationUrl() . 'js/libs/angular.min.js?'.$CC_CONFIG['airtime_version'];
$widgetStyle = $request->getParam('style'); $widgetStyle = $request->getParam('style');
if ($widgetStyle == "premium") { if ($widgetStyle == "premium") {
$this->view->widgetStyle = "premium"; $this->view->widgetStyle = "premium";

2
airtime_mvc/application/views/scripts/embed/weekly-program.phtml
View file

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.js" type="text/javascript"></script> <script src="<?php echo $this->angular ?>" type="text/javascript"></script>
<link rel="stylesheet" href="<?php echo $this->css?>" type="text/css"> <link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
<script src="<?php echo $this->jquery ?>" type="text/javascript"></script> <script src="<?php echo $this->jquery ?>" type="text/javascript"></script>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>