Applying 'use_unminimized_js' setting to twilio.js file

Gipetto · Gipetto · commit 51886f12e2ad · 2011-09-16T15:42:39.000-07:00
diff --git a/OpenVBX/controllers/iframe.php b/OpenVBX/controllers/iframe.php
@@ -46,7 +46,8 @@ function index() {
 		// look at protocol and serve the appropriate file, https comes from amazon aws
 		$tjs_baseurl = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ?
 			'https://s3.amazonaws.com/static.twilio.com' : 'http://static.twilio.com';
-		$data['twilio_js'] = $tjs_baseurl.'/libs/twiliojs/1.0/twilio.js';
+		$twilio_js_file = 'twilio'.($this->config->item('use_unminimized_js') ? '' : '.min').'.js';
+		$data['twilio_js'] = $tjs_baseurl.'/libs/twiliojs/1.0/'.$twilio_js_file;
 
 		if (!empty($this->application_sid))
 		{

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ function index() {`
`46`	`46`	`// look at protocol and serve the appropriate file, https comes from amazon aws`
`47`	`47`	`$tjs_baseurl = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ?`
`48`	`48`	`'https://s3.amazonaws.com/static.twilio.com' : 'http://static.twilio.com';`
`49`		`- $data['twilio_js'] = $tjs_baseurl.'/libs/twiliojs/1.0/twilio.js';`
	`49`	`+ $twilio_js_file = 'twilio'.($this->config->item('use_unminimized_js') ? '' : '.min').'.js';`
	`50`	`+ $data['twilio_js'] = $tjs_baseurl.'/libs/twiliojs/1.0/'.$twilio_js_file;`
`50`	`51`
`51`	`52`	`if (!empty($this->application_sid))`
`52`	`53`	`{`