Skip to content

Commit

Permalink
Merge branch 'develop' into release/2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MKodde committed Apr 4, 2019
2 parents 03c7fb0 + fd7101e commit 99d1bd2
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
/.web-server-pid
/app/config/parameters.yml
/app/config/global_view_parameters.yml
/app/config/*.pem
/app/config/*.crt
/build/
/var/*
!/var/cache
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## Next release

## 2.1.10 .. 2.1.12
This release adds some JavaScript browser support for older IE browsers. This should result in the ability to perform tiqr registrations and authentications in IE >= 8.

- Add ECMAScript 3 support #75
- Spinner support for non SVG SMIL supporting browsers #77

## 2.1.9
A bugfix release where Firebase push notifications would contain a
duplicate text. See #74 for more details.
Expand Down
8 changes: 8 additions & 0 deletions app/Resources/scss/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
}
}

.img-rotate {
animation: spin 1s linear infinite;
}

@keyframes spin {
100% { transform: rotate(360deg); }
}

table.sp-table {
width: 100%;

Expand Down
2 changes: 1 addition & 1 deletion src/AppBundle/Controller/AuthenticationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ private function sendNotification($notificationType, $notificationAddress)

$this->logger->notice(
sprintf(
'Successfully send push notification for type "%s" and address "%s"',
'Successfully sent push notification for type "%s" and address "%s"',
$notificationType,
$notificationAddress
)
Expand Down
7 changes: 7 additions & 0 deletions src/AppBundle/Resources/javascript/authentication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ window.bootstrapAuthentication = (statusApiUrl: string, notificationApiUrl: stri
statusErrorComponent,
notificationErrorComponent,
);

authenticationPageService.switchToPolling();

return authenticationPageService;
};

// Fallback for non-SVG supporting browsers (for the spinner)
if (typeof SVGRect === 'undefined') {
jQuery('img.spinner').attr('src', '/images/spinner.gif').attr('height', '38');
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/**
* @var {AuthenticationPageService} authenticationPageService
*/
var authenticationPageService = bootstrapAuthentication(
var authenticationPageService = window.bootstrapAuthentication(
"{{ path('app_identity_authentication_status') | escape('js') }}",
"{{ path('app_identity_authentication_notification') | escape('js') }}"
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>
<script src="{{ asset('build/registration.js') }}" ></script>
<script>
var registrationStateMachine = bootstrapRegistration(
var registrationStateMachine = window.bootstrapRegistration(
"{{ path('app_identity_registration_status') | escape('js') }}",
"{{ path('app_identity_registration') | escape('js') }}"
);
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"compilerOptions": {
/* Basic Options */
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
"target": "es3", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
Expand Down
Binary file added web/images/spinner.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ Encore
.addEntry('authentication', './src/AppBundle/Resources/javascript/authentication.ts')
.addEntry('registration', './src/AppBundle/Resources/javascript/registration.ts')

// Disable minification to support ie8
.configureUglifyJsPlugin(function (options) {
options.ie8 = true;
options.compress = {
screw_ie8: false,
};
options.mangleProperties = {
screw_ie8: false,
};
options.output = {
screw_ie8: false,
};
})

// Convert sass files.
.enableSassLoader(function (options) {
// https://github.com/sass/node-sass#options.
Expand Down

0 comments on commit 99d1bd2

Please sign in to comment.