From 735835e8c7971775c6f605b8017d881288418300 Mon Sep 17 00:00:00 2001 From: Alexander Kondratyev Date: Wed, 1 Mar 2017 21:29:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20?= =?UTF-8?q?=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D0=BF=D0=BE=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trademark/static/trademark/js/form.js | 12 ++++++-- trademark/static/trademark/js/modal.js | 36 ++++++++++++++++++------ trademark/static/trademark/js/result.js | 9 +++--- trademark/templates/trademark/form.html | 8 +++++- trademark/templates/trademark/modal.html | 4 +-- 5 files changed, 51 insertions(+), 18 deletions(-) diff --git a/trademark/static/trademark/js/form.js b/trademark/static/trademark/js/form.js index 632c102..5768c87 100644 --- a/trademark/static/trademark/js/form.js +++ b/trademark/static/trademark/js/form.js @@ -1,4 +1,6 @@ TrademarkSearchForm = (function(searchContainer){ + var advanced_form_scope = angular.element($('.trademark-search-advanced-form')).scope(); + function send () { var request = $(searchContainer + " .trademark-search-request").val(), $form = $(searchContainer + ' .trademark-search-form'), @@ -6,6 +8,7 @@ TrademarkSearchForm = (function(searchContainer){ $status_list = $(searchContainer + ' .trademark-search-loading-status'), $count = $(searchContainer + ' .trademark-search-count'), $title = $(searchContainer + ' .trademark-search-request-value'), + $advanced_search = $(searchContainer + ' .trademark-search-advanced-form'), $sending = $(searchContainer + ' .trademark-search-sending'), $identity = $(searchContainer + ' .trademark-search-identity'), $contains = $(searchContainer + ' .trademark-search-contains'), @@ -61,10 +64,13 @@ TrademarkSearchForm = (function(searchContainer){ } - if(completed || almost_completed) { - document.location.href = tm_url; + if((completed || almost_completed) && advanced_form_scope.opened == false) { + document.location.href = tm_url + "#?nices=" + advanced_form_scope.classes_values.join(','); } else { + if (completed || almost_completed) { + advanced_form_scope.tm_url = tm_url; + } iteration += 1; setTimeout(function () { get_status(slug); @@ -95,6 +101,7 @@ TrademarkSearchForm = (function(searchContainer){ { 'keyword': request}).done(function(data) { var tm_count = Math.floor(Math.random() * (3000000 - 1000000) + 1000000); $(searchContainer + ' .trademark-search-count-number').text(tm_count.toLocaleString() + ' знаков') + $advanced_search.show(); $count.show(500); $identity.delay(3000).show(500); $contains.delay(6000).show(500); @@ -108,7 +115,6 @@ TrademarkSearchForm = (function(searchContainer){ }) .always(function(data) { - $sending.hide() }); } diff --git a/trademark/static/trademark/js/modal.js b/trademark/static/trademark/js/modal.js index 251a719..445be19 100644 --- a/trademark/static/trademark/js/modal.js +++ b/trademark/static/trademark/js/modal.js @@ -7,6 +7,7 @@ angular.module('zuykov') $scope.classes_values = selected_nices ? selected_nices.split(',') : []; $scope.classes = $scope.classes_values.length; $scope.animationsEnabled = true; + $scope.opened = false; $scope.open = function (form_id) { @@ -16,11 +17,35 @@ angular.module('zuykov') controller: 'ModalTrademarkSearchInstanceCtrl', windowClass: 'trademark-search-modal' }); + $scope.opened = true; + $scope.tm_url = false; - modalInstance.result.then(function (selectedItem) { + modalInstance.result.then(function (classes_values) { var selected_nices = $location.search().nices || false; - $scope.classes_values = selected_nices ? selected_nices.split(',') : []; + + $scope.classes_values = classes_values; $scope.classes = $scope.classes_values.length; + + console.log($scope.classes_values, $scope.classes); + + $scope.opened = false; + + if (typeof(searchResults) != "undefined") { + $.urlParamUpdate('nices', $scope.classes_values.join(',')); + searchResults.expand(); + } + + if (typeof(searchResults) == 'undefined' && $scope.tm_url != false) { + document.location.href = $scope.tm_url + "#?nices=" + $scope.classes_values.join(','); + } + console.log('load'); + + }, function () { + $scope.opened = false; + console.log('cancle'); + if (typeof(searchResults) == 'undefined' && $scope.tm_url != false) { + document.location.href = $scope.tm_url + "#?nices=" + $scope.classes_values.join(','); + } }); }; @@ -37,13 +62,8 @@ angular.module('zuykov') $scope.categories = nicesCategories; $scope.GetNoun = GetNoun; - $scope.ok = function () { - $.urlParamUpdate('nices', $scope.classes_values.join(',')); - - searchResults.expand(); - - $modalInstance.close('params'); + $modalInstance.close($scope.classes_values); }; $scope.cancel = function () { diff --git a/trademark/static/trademark/js/result.js b/trademark/static/trademark/js/result.js index c23110e..814f32c 100644 --- a/trademark/static/trademark/js/result.js +++ b/trademark/static/trademark/js/result.js @@ -1,4 +1,5 @@ TrademarkSearchResult = (function (resultContainer) { + var all_count = 0; var total_count = 0; function prepare_nice_products ($nice) { @@ -11,13 +12,13 @@ TrademarkSearchResult = (function (resultContainer) { } function prepare_load_more ($container, display_classes) { - var all_count = $container.find(".load-more-result").size(), - results_count = $container.find(".load-more-result.filtered").size(), + var results_count = $container.find(".load-more-result.filtered").size(), showed = 6, $this = $container, $count = $container.find('.load-more-count'), $detail_count = $container.find(".trademark-search-results-detail-count"); + all_count = $container.find(".load-more-result").size(); total_count += results_count; function update_count() { @@ -80,7 +81,7 @@ TrademarkSearchResult = (function (resultContainer) { $(resultContainer + ' .trademark-search-flush-filter').click(function () { $.urlParamUpdate('nices', ''); - scope = angular.element($('.trademark-search-form')).scope(); + scope = angular.element($('.trademark-search-advanced-form')).scope(); scope.$apply(function () { scope.classes_values = []; scope.classes = 0; @@ -95,6 +96,7 @@ TrademarkSearchResult = (function (resultContainer) { var trademarkSearchFilter = selected_nices ? selected_nices.split(',') : []; var display_css_classes = trademarkSearchFilter.length == 0 ? resultContainer + ' .load-more-result' : resultContainer + ' .c' + trademarkSearchFilter.join(', ' + resultContainer +' .c'); + all_count = 0; total_count = 0; $(resultContainer + ' .load-more').unbind('click'); @@ -106,7 +108,6 @@ TrademarkSearchResult = (function (resultContainer) { prepare_load_more($(this)); }); - console.log(total_count); if (total_count == 0) { $(resultContainer + ' .trademark-search-results-null').css('display', 'block'); } else { diff --git a/trademark/templates/trademark/form.html b/trademark/templates/trademark/form.html index 4d320f5..6f8d849 100644 --- a/trademark/templates/trademark/form.html +++ b/trademark/templates/trademark/form.html @@ -12,7 +12,7 @@
Поиск знака «Coca-cola» - + +
+ +