mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

cleaned up validation shims/modules

This commit is contained in:
Keivan Beigi 2015-02-07 07:40:31 -08:00
parent e4a93ded28
commit 672e1bd9ed
4 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/UI/Mixins/AsValidatedView.js
View File

@ -1,6 +1,5 @@
var Validation = require('backbone.validation');
var _ = require('underscore');
require('../jQuery/jquery.validation');
module.exports = (function(){
'use strict';

7
src/UI/Shims/backbone.validation.js
View File

@ -1,8 +1,7 @@
require('backbone');
require('../jQuery/jquery.validation');
require('../JsLibraries/backbone.validation');
var $ = require('jquery');
var jqueryValidation = require('../jQuery/jquery.validation');
jqueryValidation.call($);
require('backbone');
require('../jQuery/jquery.validation');
require('../JsLibraries/backbone.validation');
module.exports = window.Backbone.Validation;

79
src/UI/jQuery/RouteBinder.js
View File

@ -2,50 +2,49 @@ var Backbone = require('backbone');
var $ = require('jquery');
var StatusModel = require('../System/StatusModel');
module.exports = (function(){
var routeBinder = {
bind : function(){
var self = this;
$(document).on('click', 'a[href]', function(event){
self._handleClick(event);
});
},
_handleClick : function(event){
var $target = $(event.target);
if($target.parents('.nav-tabs').length) {
var routeBinder = {
bind : function(){
var self = this;
$(document).on('click', 'a[href]', function(event){
self._handleClick(event);
});
},
_handleClick : function(event){
var $target = $(event.target);
if($target.parents('.nav-tabs').length) {
return;
}
if($target.hasClass('no-router')) {
return;
}
var href = event.target.getAttribute('href');
if(!href && $target.closest('a') && $target.closest('a')[0]) {
var linkElement = $target.closest('a')[0];
if($(linkElement).hasClass('no-router')) {
return;
}
if($target.hasClass('no-router')) {
return;
}
var href = event.target.getAttribute('href');
if(!href && $target.closest('a') && $target.closest('a')[0]) {
var linkElement = $target.closest('a')[0];
if($(linkElement).hasClass('no-router')) {
return;
}
href = linkElement.getAttribute('href');
}
event.preventDefault();
if(!href) {
throw 'couldn\'t find route target';
}
if(!href.startsWith('http')) {
if(event.ctrlKey) {
window.open(href, '_blank');
}
else {
var relativeHref = href.replace(StatusModel.get('urlBase'), '');
Backbone.history.navigate(relativeHref, {trigger : true});
}
}
else if(href.contains('#')) {
href = linkElement.getAttribute('href');
}
event.preventDefault();
if(!href) {
throw 'couldn\'t find route target';
}
if(!href.startsWith('http')) {
if(event.ctrlKey) {
window.open(href, '_blank');
}
else {
window.open('http://www.dereferer.org/?' + encodeURI(href), '_blank');
var relativeHref = href.replace(StatusModel.get('urlBase'), '');
Backbone.history.navigate(relativeHref, {trigger : true});
}
}
};
return routeBinder;
}).call(this);
else if(href.contains('#')) {
window.open(href, '_blank');
}
else {
window.open('http://www.dereferer.org/?' + encodeURI(href), '_blank');
}
}
};
module.exports = routeBinder;

7
src/UI/jQuery/jquery.validation.js
View File

@ -1,7 +1,6 @@
var $ = require('jquery');
module.exports = (function(){
module.exports = function(){
'use strict';
var $ = this;
$.fn.processServerError = function(error){
var validationName = error.propertyName.toLowerCase();
var errorMessage = this.formatErrorMessage(error);
@ -72,4 +71,4 @@ module.exports = (function(){
}
return errorMessage;
};
}).call(this);
};