Skip to content

Commit

Permalink
FeatImpl] improve invalid url detection
Browse files Browse the repository at this point in the history
[Refact] add spacing
  • Loading branch information
MinhasKamal committed Jun 22, 2018
1 parent 75a3980 commit def14ce
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions app/home/home.js
Expand Up @@ -30,14 +30,15 @@ homeModule.config([
$scope.downloadedFiles = {val: 0};
$scope.totalFiles = {val: 0};

var templateUrl = "github.com";
var downloadUrlPrefix = "https://minhaskamal.github.io/DownGit/#/home?url=";
var templateUrl = "https?://github.com/.+/.+";
var downloadUrlInfix = "#/home?url=";
var downloadUrlPrefix = "https://minhaskamal.github.io/DownGit/"+downloadUrlInfix;

if($routeParams.url){
$scope.url=$routeParams.url;
if ($routeParams.url) {
$scope.url = $routeParams.url;
}

if($scope.url.match(templateUrl)){
if ($scope.url.match(templateUrl)) {
var parameter = {
url: $routeParams.url,
fileName: $routeParams.fileName,
Expand All @@ -50,33 +51,32 @@ homeModule.config([
};
downGitService.downloadZippedFiles(parameter, progress, toastr);

} else if($scope.url!=""){
$scope.url = "";
} else if ($scope.url != "") {
toastr.warning("Invalid URL!", {iconClass: 'toast-down'});
}

$scope.catchEnter = function(keyEvent){
if(keyEvent.which == 13){
$scope.catchEnter = function(keyEvent) {
if (keyEvent.which == 13) {
$scope.download();
}
};

$scope.createDownLink = function() {
$scope.downUrl="";

if(!$scope.url){
if (!$scope.url) {
return;
}

if($scope.url.match(templateUrl)){
if ($scope.url.match(templateUrl)) {
$scope.downUrl = downloadUrlPrefix + $scope.url;
} else{
} else {
toastr.warning("Invalid URL!", {iconClass: 'toast-down'});
}
};

$scope.download = function() {
window.location = "#home?url="+$scope.url;
window.location = downloadUrlInfix+$scope.url;
};

}],
Expand Down

0 comments on commit def14ce

Please sign in to comment.