jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor ngTld so it can be used with plain strings

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-04-03 16:20:27 -07:00
parent 89d36b8ad4
commit c85120834c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webadmin/src/3rdparty/js/angular-tld.js vendored
View File

@@ -7,13 +7,13 @@ angular.module('ngTld', [])
.directive('checkTld', checkTld);
function ngTld() {
function tldExists($path) {
function tldExists(path) {
// https://github.com/oncletom/tld.js/issues/58
return ($path.$viewValue.slice(-1) !== '.') && $path.$viewValue === tld.getDomain($path.$viewValue);
return (path.slice(-1) !== '.') && path === tld.getDomain(path);
}
function isSubdomain($path) {
return ($path.$viewValue.slice(-1) !== '.') && !!tld.getDomain($path.$viewValue) && $path.$viewValue !== tld.getDomain($path.$viewValue);
function isSubdomain(path) {
return (path.slice(-1) !== '.') && !!tld.getDomain(path) && path !== tld.getDomain(path);
}
return {
@@ -28,11 +28,11 @@ function checkTld(ngTld) {
require: 'ngModel',
link: function(scope, element, attr, ngModel) {
ngModel.$validators.invalidTld = function(modelValue, viewValue) {
return ngTld.tldExists(ngModel);
return ngTld.tldExists(ngModel.$viewValue);
};
ngModel.$validators.invalidSubdomain = function(modelValue, viewValue) {
return !ngTld.isSubdomain(ngModel);
return !ngTld.isSubdomain(ngModel.$viewValue);
};
}
};