diff --git a/web/app/assets/javascripts/url_validator.js.coffee b/web/app/assets/javascripts/url_validator.js.coffee index 6e3ece018..08546ac31 100644 --- a/web/app/assets/javascripts/url_validator.js.coffee +++ b/web/app/assets/javascripts/url_validator.js.coffee @@ -4,11 +4,11 @@ context.JK ||= {}; context.JK.UrlValidator = class UrlValidator - constructor: (input_div, site_type) -> + constructor: (site_type) -> @EVENTS = context.JK.EVENTS @rest = context.JK.Rest() @site_type = site_type - @input_div = input_div + @input_div = $(".url_validator#"+site_type+"_url") @data_input = @input_div.find('input') this.show_format_status() @logger = context.JK.logger diff --git a/web/app/views/clients/_url_validator.html.slim b/web/app/views/clients/_url_validator.html.slim index dd5d4b74a..bd4d3d422 100644 --- a/web/app/views/clients/_url_validator.html.slim +++ b/web/app/views/clients/_url_validator.html.slim @@ -1,7 +1,7 @@ -div class="url_validator" id="#{siteid}_url" +div class="url_validator" id="#{site_type}_url" span class="validate-checkmark" span class="spinner-small upload-spinner" - input type='text' id="url_input_#{siteid}" maxlength="2000" + input type='text' id="validate_input_#{site_type}" maxlength="2000" br div class="error" diff --git a/web/app/views/spikes/site_validate.html.slim b/web/app/views/spikes/site_validate.html.slim index 2402e560a..b2f58273b 100644 --- a/web/app/views/spikes/site_validate.html.slim +++ b/web/app/views/spikes/site_validate.html.slim @@ -1,14 +1,14 @@ = javascript_include_tag "url_validator" div style="width:50%" - = render "clients/url_validator", siteid: 'foobar' + = render "clients/url_validator", site_type: 'url' = stylesheet_link_tag "client/url_validator" javascript: var initialized = false; $(document).on('JAMKAZAM_READY', function(e, data) { setTimeout(function() { - window.url_validator = new JK.UrlValidator($(".url_validator#foobar_url"), 'url') + window.url_validator = new JK.UrlValidator('url') url_validator.init() - $('#url_input_foobar').val('http://www.jamkazam.com') + $('#validate_input_url').val('http://www.jamkazam.com') }, 1) })