Skip to content

yotta / pictogram

Go to a project
Commit d711097c by Sebastián Collado Montañez
Options

#37 valid browser before angular

parent f774c2da
Inline Side-by-side
Showing with 83 additions and 69 deletions
sails/src/assets/scripts/check_browser.js 0 → 100644
// Return client browser. ex: $scope.clientBrowser == [ "Firefox", "51"]
var clientBrowser = (function(){
var ua= navigator.userAgent, tem,
M= ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
if(/trident/i.test(M[1])){
tem= /\brv[ :]+(\d+)/g.exec(ua) || [];
return 'IE '+(tem[1] || '');
}
if(M[1]=== 'Chrome'){
tem= ua.match(/\b(OPR|Edge)\/(\d+)/);
if(tem!= null) return tem.slice(1).join(' ').replace('OPR', 'Opera');
}
M= M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
if((tem= ua.match(/version\/(\d+)/i))!= null) M.splice(1, 1, tem[1]);
return M.join(' ');
})().split(" ");
// Return if client browser valid or not
var validBrowser = false;
if(clientBrowser[0] == "Firefox" && parseInt(clientBrowser[1]) >= 52 )
validBrowser = true;
if(clientBrowser[0] == "Chrome" && parseInt(clientBrowser[1]) >= 51 )
validBrowser = true;
sails/src/assets/scripts/modules/login/controllers/login.js
...@@ -17,30 +17,8 @@ function LoginCtrl( ...@@ -17,30 +17,8 @@ function LoginCtrl(
$stateParams, $stateParams,
ngToast) { ngToast) {
// Return client browser. ex: $scope.clientBrowser == [ "Firefox", "51"] // Valid browser into scope (from assets/scripts/check_browser.js)
$scope.clientBrowser = (function(){ $scope.validBrowser = validBrowser;
var ua= navigator.userAgent, tem,
M= ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
if(/trident/i.test(M[1])){
tem= /\brv[ :]+(\d+)/g.exec(ua) || [];
return 'IE '+(tem[1] || '');
}
if(M[1]=== 'Chrome'){
tem= ua.match(/\b(OPR|Edge)\/(\d+)/);
if(tem!= null) return tem.slice(1).join(' ').replace('OPR', 'Opera');
}
M= M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
if((tem= ua.match(/version\/(\d+)/i))!= null) M.splice(1, 1, tem[1]);
return M.join(' ');
})().split(" ");
console.log($scope.clientBrowser);
// Return if client browser valid or not
$scope.validBrowser = false;
if($scope.clientBrowser[0] == "Firefox" && parseInt($scope.clientBrowser[1]) >= 52 )
$scope.validBrowser = true;
if($scope.clientBrowser[0] == "Chrome" && parseInt($scope.clientBrowser[1]) >= 51 )
$scope.validBrowser = true;
$scope.credentials = { $scope.credentials = {
email: '', email: '',
......
sails/src/assets/scripts/modules/login/views/login.html
<!-- Office image -->
<div class="row"> <div class="row">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<!-- Logo Pictogram <!-- Logo Pictogram
...@@ -11,7 +12,9 @@ ...@@ -11,7 +12,9 @@
</p> </p>
</div> </div>
</div> </div>
<!--/. Office image -->
<!-- Valid browser -->
<div class="row" ng-if="!validBrowser"> <div class="row" ng-if="!validBrowser">
<div class="container"> <div class="container">
<div class="alert alert-warning"> <div class="alert alert-warning">
...@@ -20,56 +23,65 @@ ...@@ -20,56 +23,65 @@
</div> </div>
</div> </div>
<!-- Main row -->
<div class="row"> <div class="row">
<!-- Rejilla 3 elementos de igual ancho --> <!-- Form column and offset -->
<div class="col-md-2">&nbsp;</div> <div class="col-md-4 col-md-offset-2">
<div class="col-md-4"> <div id="login">
<div id="login"> <!-- Formulario -->
<!-- Formulario --> <!-- LoginCtrl controls here, see app.js -->
<!-- LoginCtrl controls here, see app.js --> <form name="loginForm" ng-submit="login()" novalidate>
<form name="loginForm" ng-submit="login()" novalidate> <!-- Email -->
<div class="form-group">
<div class="form-group"> <label translate>email</label>:
<label translate>email</label>: <input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" />
<input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" /> </div>
</div> <!-- Password -->
<div class="form-group"> <div class="form-group">
<label translate>password</label>: <label translate>password</label>:
<input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" /> <input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" />
</div>
<!-- Remember -->
<div class="checkbox">
<label>
<input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
</label>
</div>
<div class="row">
<div class="col-md-12">
<!-- Login -->
<div class="pull-left">
<button type="submit" class="btn btn-primary" translate>login</button>
</div> </div>
<div class="checkbox"> <!-- Spinner -->
<label> <div class="pull-left">
<input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }} <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
</label>
</div> </div>
<div class="row"> <!-- Create account -->
<div class="col-md-12"> <div class="pull-right margin-top7">
<div class="pull-left"> <a href="/app/#/signin" translate>create_an_account</a>
<button type="submit" class="btn btn-primary" translate>login</button>
</div>
<div class="pull-left">
<i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
</div>
<div class="pull-right margin-top7">
<a href="/app/#/signin" translate>create_an_account</a>
</div>
</div>
</div>
<div class="text-center margin-top15">
<br/>
<a href="/app/#/changepass" translate>password_forgotten</a>
</div> </div>
</form> </div>
</div> </div>
<!-- Fin login --> <!-- Remember password -->
</div> <div class="text-center margin-top15">
<div class="col-md-4"> <br>
<img src="img/login.png" alt="Pictogram" title="Pictogram" /> <a href="/app/#/changepass" translate>password_forgotten</a>
</div> </div>
<div class="col-md-2">&nbsp;</div> </form>
</div> </div>
<!-- Fin de row --> <!--/. login -->
</div>
<!--/. form column -->
<!-- Image column -->
<div class="col-md-4">
<img src="img/login.png" alt="Pictogram" title="Pictogram" />
</div>
<!--/. image column -->
</div>
<!--/. main row -->
<footer-translate></footer-translate> <footer-translate></footer-translate>
sails/src/tasks/config/concat.js
...@@ -3,6 +3,7 @@ module.exports = function (grunt) { ...@@ -3,6 +3,7 @@ module.exports = function (grunt) {
var jsLibs = [ var jsLibs = [
// JQuery is added because ng-file-upload produces errors if not // JQuery is added because ng-file-upload produces errors if not
'assets/app/bower_components/jquery/dist/jquery.min.js', 'assets/app/bower_components/jquery/dist/jquery.min.js',
'assets/scripts/check_browser.js',
'assets/app/bower_components/angular/angular.js', 'assets/app/bower_components/angular/angular.js',
'assets/app/bower_components/angular-bootstrap/ui-bootstrap.min.js', 'assets/app/bower_components/angular-bootstrap/ui-bootstrap.min.js',
'assets/app/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js', 'assets/app/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment