Skip to content

Commit 4199970

Browse files
committed
convert to vendor module
1 parent 700fb09 commit 4199970

File tree

7 files changed

+45
-27
lines changed

7 files changed

+45
-27
lines changed

_config/addressfinder.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
---
2+
name: silverstripe-addressfinder
3+
---
14
SilverStripe\Admin\LeftAndMain:
25
extra_requirements_javascript:
3-
- 'addressfinder/javascript/addressfinder_ent.js'
6+
- 'fullscreeninteractive/silverstripe-addressfinder:client/javascript/addressfinder_ent.js'
File renamed without changes.
File renamed without changes.

composer.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
{
22
"name": "fullscreeninteractive/silverstripe-addressfinder",
3-
"type": "silverstripe-module",
3+
"type": "silverstripe-vendormodule",
44
"description": "SilverStripe FormField for AddressFinder.co.nz",
55
"keywords": ["silverstripe", "form"],
66
"homepage": "https://github.com/fullscreeninteractive/silverstripe-addressfinder",
77
"license": "BSD-3-Clause",
88
"authors": [{
99
"name": "Fullscreen Interactive Limited",
1010
"email": "[email protected]",
11-
"homepage": "http://fullscreen.io"
11+
"homepage": "https://www.fullscreen.io"
1212
}],
13-
"extra": {
14-
"installer-name": "addressfinder"
15-
},
1613
"require": {
17-
"silverstripe/framework": "^4@dev"
14+
"silverstripe/framework": "^4"
15+
},
16+
"autoload": {
17+
"psr-4": {
18+
"FullscreenInteractive\\SilverStripe\\": "src/"
19+
}
20+
},
21+
"scripts": {
22+
"lint": "phpcs src/ tests/",
23+
"lint-clean": "phpcbf src/ tests/"
1824
}
1925
}

src/AddressFinderField.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
* but as per best practices (http://addressfinder.co.nz/docs/best_practices)
1919
* this FormField also provides fallback fields in case the user cannot find
2020
* their address
21-
*
22-
* @package addressfinder
2321
*/
2422

2523
class AddressFinderField extends TextField
@@ -195,7 +193,7 @@ public function FieldHolder($properties = array())
195193
// leftandmain check. If admin then use entwine.
196194
} else {
197195
if(Config::inst()->get(AddressFinderField::class, 'include_address_finder_js')) {
198-
Requirements::javascript('addressfinder/javascript/addressfinder.js');
196+
Requirements::javascript('fullscreeninteractive/silverstripe-addressfinder:client/javascript/addressfinder.js');
199197
}
200198
}
201199

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
<div class="address_finder" data-api-key="$ApiKey" >
2-
<div id="$Name" class="address_finder_address form-group field text<% if $extraClass %> $extraClass<% end_if %>" style="display: none;">
3-
<% if $Title %><label class="form__field-label" for="$ID">$Title</label><% end_if %>
1+
<div class="address_finder" data-api-key="$ApiKey">
2+
<div id="$Name" class="address_finder_address form-group field text<% if $extraClass %> $extraClass<% end_if %>" style="display: none;">
3+
<% if $Title %><label class="form__field-label" for="$ID">$Title</label><% end_if %>
44

5-
<div class="form__field-holder">
5+
<div class="form__field-holder">
66
<div class="addressfinder__holder" style="position: relative">
7-
$AddressField
7+
$AddressField
88
</div>
99

10-
<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
11-
<% if $Description %><p class="form__field-description">$Description</p><% end_if %>
10+
<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
11+
<% if $Description %><p class="form__field-description">$Description</p><% end_if %>
1212

13-
<div class='address_finder_attribution'>
14-
<p><a href='http://addressfinder.co.nz'>AddressFinder</a> provided by <a href='http://www.abletech.co.nz/'>Able Technology</a></p>
15-
</div>
13+
<div class='address_finder_attribution'>
14+
<p><a href='http://addressfinder.co.nz'>AddressFinder</a> provided by <a href='http://www.abletech.co.nz/'>Able Technology</a></p>
15+
</div>
1616

1717
<div class="toggle_manual_address" style="display: none">
1818
<p><a href="#"><% _t('AddressFinderField.ENTERMANUAL', 'Enter your address manually') %></a></p>
1919
</div>
2020
</div>
2121

2222
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
23-
</div>
23+
</div>
2424

25-
<div class="manual_address">
26-
$ManualToggleField
25+
<div class="manual_address">
26+
$ManualToggleField
2727

28-
<% loop ManualAddressFields %>
29-
$FieldHolder
30-
<% end_loop %>
31-
</div>
28+
<% loop ManualAddressFields %>
29+
$FieldHolder
30+
<% end_loop %>
31+
</div>
3232
</div>

tests/AddressFinderFieldTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace FullscreenInteractive\SilverStripeAddressFinder\Tests;
4+
5+
use SilverStripe\Dev\SapphireTest;
6+
use FullscreenInteractive\SilverStripe\AddressFinderField;
7+
8+
class AddressFinderFieldTest extends SapphireTest
9+
{
10+
11+
}

0 commit comments

Comments
 (0)