Skip to content

Commit c7f0c4c

Browse files
smarcetsmarcet
committed
[smarcet] - #14412
* refactoring
1 parent 2841edd commit c7f0c4c

15 files changed

Lines changed: 41 additions & 54 deletions

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"openstack/code/utils/traits",
7676
"openstack/code/utils/apis/traits",
7777
"openstack/code/utils/apis",
78-
"googlemaps/code/traits",
7978
"summit/code/pages/summit_entities/traits",
8079
"openstack/code/utils/DB/traits",
8180
"openstack/code/utils/DDD/model/traits"

‎gerrit_ingest/code/ui/admin/SangriaPageGerritStatisticsExtension.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
class SangriaPageGerritStatisticsExtension extends Extension {
1616

17-
use GoogleMapLibs;
18-
1917
public function onBeforeInit(){
2018
Config::inst()->update(get_class($this), 'allowed_actions', array('GerritStatisticsReport'));
2119
Config::inst()->update(get_class($this->owner), 'allowed_actions', array('GerritStatisticsReport'));
@@ -25,7 +23,7 @@ public function GerritStatisticsReport(){
2523

2624
JQueryCoreDependencies::renderRequirements();
2725
BootstrapDependencies::renderRequirements();
28-
$this->InitGoogleMapLibs();
26+
GoogleMapScriptBuilder::renderMarkersClustered();
2927
Requirements::css('gerrit_ingest/css/sangria.page.gerrit.statistics.report.css');
3028
Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
3129
Requirements::javascript('themes/openstack/javascript/Chart.js');

‎jobs/code/ui/admin/SangriaPageJobsExtension.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ public function getPostedJobsCount(){
8181

8282
function JobRegistrationRequestForm(){
8383
$this->commonScripts();
84-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
85-
Requirements::javascript($google_map_lib_url);
84+
GoogleMapScriptBuilder::build('false');
8685
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
8786
Requirements::css('jobs/css/job.registration.form.css');
8887
Requirements::javascript("jobs/js/job.registration.form.js");
@@ -101,8 +100,7 @@ function JobRegistrationRequestForm(){
101100

102101
function JobForm(){
103102
$this->commonScripts();
104-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
105-
Requirements::javascript($google_map_lib_url);
103+
GoogleMapScriptBuilder::renderRequirements('false');
106104
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
107105
Requirements::css('jobs/css/job.registration.form.css');
108106
Requirements::javascript("jobs/js/job.registration.form.js");

‎jobs/code/ui/frontend/JobPage_Controller.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ function init() {
4141
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
4242
JSChosenDependencies::renderRequirements();
4343
JQueryValidateDependencies::renderRequirements();
44-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
45-
Requirements::javascript($google_map_lib_url);
44+
GoogleMapScriptBuilder::renderRequirements('false');
4645
Requirements::javascript("marketplace/code/ui/admin/js/geocoding.jquery.js");
4746
Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
4847
Requirements::javascript('node_modules/pure/libs/pure.min.js');

‎jobs/code/ui/frontend/JobRegistrationRequestPage.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ function init() {
5151
JSChosenDependencies::renderRequirements();
5252
JQueryValidateDependencies::renderRequirements();
5353

54-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
55-
Requirements::javascript($google_map_lib_url);
54+
GoogleMapScriptBuilder::renderRequirements('false');
5655

5756
$js_files = [
5857
"marketplace/code/ui/admin/js/geocoding.jquery.js",

‎marketplace/code/ui/admin/MarketPlaceAdminPage.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,7 @@ public function public_cloud()
549549
Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
550550
Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
551551
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
552-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
553-
Requirements::javascript($google_map_lib_url);
552+
GoogleMapScriptBuilder::renderRequirements('false');
554553
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
555554
HtmlEditorField::include_js();
556555
Requirements::javascript('marketplace/code/ui/admin/js/public_cloud.js');
@@ -571,8 +570,7 @@ public function private_cloud()
571570
Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
572571
Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
573572
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
574-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
575-
Requirements::javascript($google_map_lib_url);
573+
GoogleMapScriptBuilder::renderRequirements('false');
576574
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
577575
HtmlEditorField::include_js();
578576
Requirements::javascript('marketplace/code/ui/admin/js/private_cloud.js');
@@ -610,8 +608,7 @@ public function consultant()
610608
Requirements::javascript('marketplace/code/ui/admin/js/spoken.languages.js');
611609
Requirements::javascript('marketplace/code/ui/admin/js/offices.js');
612610
Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
613-
$google_map_lib_url = sprintf("https://maps.googleapis.com/maps/api/js?key=%s&sensor=false", GOOGLE_MAP_KEY);
614-
Requirements::javascript($google_map_lib_url);
611+
GoogleMapScriptBuilder::renderRequirements('false');
615612
Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
616613
Requirements::javascript('marketplace/code/ui/admin/js/consultant.js');
617614
return $this->getViewer('consultant')->process($this);

‎marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
*/
1717
abstract class CloudsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Controller {
1818

19-
use GoogleMapLibs;
20-
2119
private static $allowed_actions = array('handleIndex','handleFilter');
2220

2321
/**
@@ -151,7 +149,7 @@ function init() {
151149

152150
JSChosenDependencies::renderRequirements();
153151

154-
$this->InitGoogleMapLibs();
152+
GoogleMapScriptBuilder::renderMarkersClustered();
155153

156154
Requirements::combine_files('marketplace_clouds_directory_page.js', array(
157155
"marketplace/code/ui/frontend/js/clouds.directory.page.js",

‎marketplace/code/ui/frontend/ConsultantsDirectoryPage.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class ConsultantsDirectoryPage extends MarketPlaceDirectoryPage
2323
*/
2424
class ConsultantsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Controller {
2525

26-
use GoogleMapLibs;
27-
2826
static $allowed_actions = array(
2927
'getCurrentOfficesLocationsJson','handleIndex','handleFilter',
3028
);
@@ -74,7 +72,7 @@ function init() {
7472

7573
JSChosenDependencies::renderRequirements();
7674

77-
$this->InitGoogleMapLibs();
75+
GoogleMapScriptBuilder::renderMarkersClustered();
7876

7977
Requirements::combine_files('marketplace_consultants_directory_page.js', array(
8078
"marketplace/code/ui/frontend/js/consultants.directory.page.js"

‎marketplace/code/ui/frontend/MarketPlaceLandingPage.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ final class MarketPlaceLandingPage_Controller extends MarketPlacePage_Controller
2727
*/
2828
private $public_cloud_repository;
2929

30-
use GoogleMapLibs;
31-
3230
function init(){
3331
parent::init();
3432

3533
Requirements::css("marketplace/code/ui/frontend/css/marketplace.landing.css");
3634

37-
$this->InitGoogleMapLibs();
35+
GoogleMapScriptBuilder::renderMarkersClustered();
3836

3937
Requirements::combine_files('marketplace_landing.js',
4038
array(

‎marketplace/code/ui/frontend/PublicCloudPassportsPage.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,10 @@ class PublicCloudPassportsPage_Controller extends Page_Controller
3838
*/
3939
private static $allowed_actions = [];
4040

41-
use GoogleMapLibs;
42-
4341
public function init()
4442
{
4543
parent::init();
46-
$this->InitGoogleMapLibs();
47-
44+
GoogleMapScriptBuilder::renderMarkersClustered();
4845
Requirements::javascript('themes/openstack/javascript/urlfragment.jquery.js');
4946
Requirements::css("marketplace/code/ui/frontend/css/passports-page.css");
5047
}

0 commit comments

Comments
 (0)