From a9223f2ff213da18507a1e2d018c284f52ec7319 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Fri, 9 Jan 2015 19:26:30 +0000
Subject: [PATCH] seohide bug fixed

---
 templates/client/blank.html                                   | 3 ++-
 templates/client/static_client/js/_modules/block.common.js    | 2 +-
 .../static_client/js/_modules/page.exposition.object.js       | 4 ++--
 .../client/static_client/js_min/_modules/block.common.min.js  | 2 +-
 .../js_min/_modules/page.exposition.object.min.js             | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/client/blank.html b/templates/client/blank.html
index b5389f95..679c5346 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -32,6 +32,7 @@ This template include basic anf main styles and js files,
 	<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
     <script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}"  type="text/javascript"></script>
     <script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.common{% if debug %}{% else %}.min{% endif %}.js"></script>
+    <!--<script src="{% static 'client/js/_modules/block.common.js' %}"></script>-->
 
 	<!--if IE 8><script src="js/selectivizr-min.js"></script><![endif]-->
     <script type="text/javascript">
@@ -60,7 +61,7 @@ This template include basic anf main styles and js files,
 -->
     <div class="page-wrap">
     {% block header %}
-        {% include 'includes/header.html' %}
+        {% include 'header.html' %}
     {% endblock %}
     {% block main_part %}
     {% endblock %}
diff --git a/templates/client/static_client/js/_modules/block.common.js b/templates/client/static_client/js/_modules/block.common.js
index de1cc82d..9b3c7676 100644
--- a/templates/client/static_client/js/_modules/block.common.js
+++ b/templates/client/static_client/js/_modules/block.common.js
@@ -445,7 +445,7 @@ if (EXPO.common){
 				var $elements = $('['+dataKey+']');
 				for(var i = 0, count = $elements.length; i < count; i++) {
 					var $element = $elements.eq(i);
-					var key = $element.data("key");
+					var key = $element.attr("data-hash");
 					switch($element.data("type")) {
 						case "href":
 							$element.attr("href", Base64.decode(this.seoHrefs[key]));
diff --git a/templates/client/static_client/js/_modules/page.exposition.object.js b/templates/client/static_client/js/_modules/page.exposition.object.js
index 0dfecda4..94de2060 100644
--- a/templates/client/static_client/js/_modules/page.exposition.object.js
+++ b/templates/client/static_client/js/_modules/page.exposition.object.js
@@ -86,8 +86,8 @@ if (EXPO.exposition.object){
 				 * setup SEOhide params
 				 */
 				$('.'+self.opt.seoLinksClass).each(function () {
-					var hash = $(self).attr('data-hash'),
-						url = $(self).attr('data-url');
+					var hash = $(this).attr('data-hash'),
+						url = $(this).attr('data-url');
 
 						com.SEOhide.seoHrefs[hash] = url;
 				});
diff --git a/templates/client/static_client/js_min/_modules/block.common.min.js b/templates/client/static_client/js_min/_modules/block.common.min.js
index 09fae266..e7a3e112 100644
--- a/templates/client/static_client/js_min/_modules/block.common.min.js
+++ b/templates/client/static_client/js_min/_modules/block.common.min.js
@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.common?console.warn("WARNING: EXPO.common is already defined!"):EXPO.common=function(){var e={},t=function(e,t){return(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector).call(e,t)};e.opt={};var s=function(e){this.fields=[],this.allIsClear=!1,this.ajaxUrl=e.getAttribute("action"),this.DOM=e,this._initFields(),this._eventController()};return s.prototype={_eventController:function(){var e=this;this.DOM.addEventListener?this.DOM.addEventListener("submit",function(t){return e.validate(),t.preventDefault(),!1},!1):this.DOM.attachEvent&&this.DOM.attachEvent("onsubmit",function(t){return e.validate(),t.preventDefault(),!1})},_initFields:function(){},validate:function(){var e,t=this,s=$(t.DOM).serialize(),o={},i="err-message-box",a=t.DOM.querySelector("."+i),n=a.innerHTML,r=function(s){if(e=s,t.unHighlightFields(),e.success)a&&EXPO.common.removeClass(a,"active"),window.location.reload();else{EXPO.common.removeClass(a,"active"),o={},t.fields=[];for(var i in e.errors)e.errors.hasOwnProperty(i)&&("__all__"!=i?(o={name:i,id:"id_"+i,errorText:e.errors[i]},t.fields.push(o)):a&&(EXPO.common.addClass(a,"active"),n.indexOf(e.errors[i])<0&&a.insertAdjacentHTML("beforeend",e.errors[i]+" ")));t.highliteFields()}};t.unHighlightFields(),EXPO.common.postRequest(s,t.ajaxUrl,r)},highliteFields:function(){for(var e,t,s=0;s<this.fields.length;s++)e=this.DOM.querySelector("#"+this.fields[s].id),t=e.parentNode,EXPO.common.addClass(t,"required"),EXPO.common.addClass(t,"err")},unHighlightFields:function(){for(var e,t,s=0;s<this.fields.length;s++)e=this.DOM.querySelector("#"+this.fields[s].id),t=e.parentNode,EXPO.common.removeClass(t,"required"),EXPO.common.removeClass(t,"err")},submit:function(){}},e.forms=[],$(function(){$("form.validate").each(function(){e.forms.push(new s(this))})}),$(function(){$.fn.customRadioCheck=function(){return $(this).each(function(){function e(){if("radio"==s){var e=t.attr("name"),o=$('input[type="radio"]').filter('[name="'+e+'"]');o.each(function(){var e=$(this).closest(".custom-radio");e.removeClass("checked"),$(this).is(":checked")&&e.addClass("checked")})}else t.prop("checked")?i.addClass("checked"):i.removeClass("checked");t.trigger("blur")}var t=$(this),s=t.attr("type"),o=t.closest("label"),i=t.wrap("<span class='custom-"+s+"' />").parent();o.addClass("custom-radio-check"),e(),t.on("change",e)})},$("input[type='checkbox'], input[type='radio']").customRadioCheck()}),e.init=function(e){$.extend(this.opt,e);{var t,s,o=this,i=this.opt.addCalendarClass,a=this.opt.removeCalendarClass,n=this.opt.addCalendarText,r=this.opt.removeCalendarText,l=o.opt.staticValidation.errorClass,c=o.opt.staticValidation.containerClass;o.opt.staticValidation.blobClass}$(function(){t=$("."+l),s=$("#"+o.opt.socialFormId),$("."+i+", ."+a).on("click",function(e){n=o.opt.addCalendarText,r=o.opt.removeCalendarText,e.preventDefault();var t=$(this),s=t.attr("href");$.get(s,function(e){e.not_authorized?$.fancybox.open("#"+o.opt.loginModalId):e.success&&(e.in?t.removeClass(i).addClass(a).text(r):t.removeClass(a).addClass(i).text(n))})}),t.length&&t.find("input:text").on("keyup",function(){""!=$.trim($(this).val())?$(this).closest("."+l).removeClass(l):$(this).closest("."+c).addClass(l)}),s.length&&($("input:text",s).on("focus",function(){var e=$(this),t=o.opt.socialInputMask;""==$.trim(e.val())&&e.val(t[0])}),$("input:text",s).on("keypress",function(){var e=$(this),t=o.opt.socialInputMask;""==$.trim(e.val())&&e.val(t[0])}),$("input:text",s).on("blur",function(){for(var e=$(this),t=o.opt.socialInputMask,s=0;s<t.length;s++)$.trim(e.val())==t[s]&&e.val("")}))})},e.hasClass=function(e,t){return e.classList?e.classList.contains(t):new RegExp("(^| )"+t+"( |$)","gi").test(el.className)},e.addClass=function(t,s){return e.hasClass(t,s)||(t.classList?t.classList.add(s):t.className+=" "+s),t},e.removeClass=function(t,s){var o=" "+t.className.replace(/[\t\r\n]/g," ")+" ";if(e.hasClass(t,s))if(t.classList)t.classList.remove(s);else{for(;o.indexOf(" "+s+" ")>=0;)o=o.replace(" "+s+" "," ");t.className=o.replace(/^\s+|\s+$/g," ")}return t},e.closest=function(t,s){for(var o=function(s){return e.hasClass(t,s)};t;){if(o(s))return t;t=t.parentNode}},e.children=function(e,s){for(var o,i=[],o=0,a=e.childNodes.length;a>o;++o)t(e.childNodes[o],s)&&i.push(e.childNodes[o]);return i},e.postRequest=function(e,t,s){e||(e=""),$.ajax({type:"POST",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},e.getRequest=function(e,t,s){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},e.Modal=function(e){var t=this;this.id,this.opt=e,this.DOMwrap=document.getElementById(e.id),this.DOM=this.DOMwrap.querySelector("."+e.wrapClass),$(".modal-close",this.DOM).on("click",function(){t.close()}),$(".modals > *").on("click",function(e){$(e.target.parentNode).find(t.DOMwrap).length&&t.close()})},e.Modal.prototype={pullData:function(e){this.id=e.substr(1),$(e).show().siblings().hide(),this.refresh()},open:function(){$(this.DOMwrap).fadeIn(),e.addClass(document.body,"ov-hidden")},close:function(){$(this.DOMwrap).fadeOut(),e.removeClass(document.body,"ov-hidden")},refresh:function(){var e=this;e.DOM.style.width=e.opt.size[e.id].width+"px",e.DOM.style.minHeight=e.opt.size[e.id].height+"px",e.DOM.style.marginLeft=-(e.opt.size[e.id].width/2)+"px",e.DOM.style.marginTop=-(e.opt.size[e.id].height/2)+"px"}},e.SEOhide={seoContent:{},seoHrefs:{},decode:function(e){for(var t=$("["+e+"]"),s=0,o=t.length;o>s;s++){var i=t.eq(s),a=i.data("key");switch(i.data("type")){case"href":i.attr("href",Base64.decode(this.seoHrefs[a]));break;case"content":i.replaceWith(Base64.decode(this.seoContent[a]))}}}},e}();
\ No newline at end of file
+var EXPO=EXPO||{};EXPO.common?console.warn("WARNING: EXPO.common is already defined!"):EXPO.common=function(){var e={},t=function(e,t){return(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector).call(e,t)};e.opt={};var s=function(e){this.fields=[],this.allIsClear=!1,this.ajaxUrl=e.getAttribute("action"),this.DOM=e,this._initFields(),this._eventController()};return s.prototype={_eventController:function(){var e=this;this.DOM.addEventListener?this.DOM.addEventListener("submit",function(t){return e.validate(),t.preventDefault(),!1},!1):this.DOM.attachEvent&&this.DOM.attachEvent("onsubmit",function(t){return e.validate(),t.preventDefault(),!1})},_initFields:function(){},validate:function(){var e,t=this,s=$(t.DOM).serialize(),o={},i="err-message-box",a=t.DOM.querySelector("."+i),n=a.innerHTML,r=function(s){if(e=s,t.unHighlightFields(),e.success)a&&EXPO.common.removeClass(a,"active"),window.location.reload();else{EXPO.common.removeClass(a,"active"),o={},t.fields=[];for(var i in e.errors)e.errors.hasOwnProperty(i)&&("__all__"!=i?(o={name:i,id:"id_"+i,errorText:e.errors[i]},t.fields.push(o)):a&&(EXPO.common.addClass(a,"active"),n.indexOf(e.errors[i])<0&&a.insertAdjacentHTML("beforeend",e.errors[i]+" ")));t.highliteFields()}};t.unHighlightFields(),EXPO.common.postRequest(s,t.ajaxUrl,r)},highliteFields:function(){for(var e,t,s=0;s<this.fields.length;s++)e=this.DOM.querySelector("#"+this.fields[s].id),t=e.parentNode,EXPO.common.addClass(t,"required"),EXPO.common.addClass(t,"err")},unHighlightFields:function(){for(var e,t,s=0;s<this.fields.length;s++)e=this.DOM.querySelector("#"+this.fields[s].id),t=e.parentNode,EXPO.common.removeClass(t,"required"),EXPO.common.removeClass(t,"err")},submit:function(){}},e.forms=[],$(function(){$("form.validate").each(function(){e.forms.push(new s(this))})}),$(function(){$.fn.customRadioCheck=function(){return $(this).each(function(){function e(){if("radio"==s){var e=t.attr("name"),o=$('input[type="radio"]').filter('[name="'+e+'"]');o.each(function(){var e=$(this).closest(".custom-radio");e.removeClass("checked"),$(this).is(":checked")&&e.addClass("checked")})}else t.prop("checked")?i.addClass("checked"):i.removeClass("checked");t.trigger("blur")}var t=$(this),s=t.attr("type"),o=t.closest("label"),i=t.wrap("<span class='custom-"+s+"' />").parent();o.addClass("custom-radio-check"),e(),t.on("change",e)})},$("input[type='checkbox'], input[type='radio']").customRadioCheck()}),e.init=function(e){$.extend(this.opt,e);{var t,s,o=this,i=this.opt.addCalendarClass,a=this.opt.removeCalendarClass,n=this.opt.addCalendarText,r=this.opt.removeCalendarText,l=o.opt.staticValidation.errorClass,c=o.opt.staticValidation.containerClass;o.opt.staticValidation.blobClass}$(function(){t=$("."+l),s=$("#"+o.opt.socialFormId),$("."+i+", ."+a).on("click",function(e){n=o.opt.addCalendarText,r=o.opt.removeCalendarText,e.preventDefault();var t=$(this),s=t.attr("href");$.get(s,function(e){e.not_authorized?$.fancybox.open("#"+o.opt.loginModalId):e.success&&(e.in?t.removeClass(i).addClass(a).text(r):t.removeClass(a).addClass(i).text(n))})}),t.length&&t.find("input:text").on("keyup",function(){""!=$.trim($(this).val())?$(this).closest("."+l).removeClass(l):$(this).closest("."+c).addClass(l)}),s.length&&($("input:text",s).on("focus",function(){var e=$(this),t=o.opt.socialInputMask;""==$.trim(e.val())&&e.val(t[0])}),$("input:text",s).on("keypress",function(){var e=$(this),t=o.opt.socialInputMask;""==$.trim(e.val())&&e.val(t[0])}),$("input:text",s).on("blur",function(){for(var e=$(this),t=o.opt.socialInputMask,s=0;s<t.length;s++)$.trim(e.val())==t[s]&&e.val("")}))})},e.hasClass=function(e,t){return e.classList?e.classList.contains(t):new RegExp("(^| )"+t+"( |$)","gi").test(el.className)},e.addClass=function(t,s){return e.hasClass(t,s)||(t.classList?t.classList.add(s):t.className+=" "+s),t},e.removeClass=function(t,s){var o=" "+t.className.replace(/[\t\r\n]/g," ")+" ";if(e.hasClass(t,s))if(t.classList)t.classList.remove(s);else{for(;o.indexOf(" "+s+" ")>=0;)o=o.replace(" "+s+" "," ");t.className=o.replace(/^\s+|\s+$/g," ")}return t},e.closest=function(t,s){for(var o=function(s){return e.hasClass(t,s)};t;){if(o(s))return t;t=t.parentNode}},e.children=function(e,s){for(var o,i=[],o=0,a=e.childNodes.length;a>o;++o)t(e.childNodes[o],s)&&i.push(e.childNodes[o]);return i},e.postRequest=function(e,t,s){e||(e=""),$.ajax({type:"POST",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},e.getRequest=function(e,t,s){e||(e=""),$.ajax({type:"GET",url:t,data:e,success:function(e){return"function"!=typeof s?e:(console.log("data recieved:"),console.log(e),console.log(JSON.stringify(e)),s(e),void 0)}})},e.Modal=function(e){var t=this;this.id,this.opt=e,this.DOMwrap=document.getElementById(e.id),this.DOM=this.DOMwrap.querySelector("."+e.wrapClass),$(".modal-close",this.DOM).on("click",function(){t.close()}),$(".modals > *").on("click",function(e){$(e.target.parentNode).find(t.DOMwrap).length&&t.close()})},e.Modal.prototype={pullData:function(e){this.id=e.substr(1),$(e).show().siblings().hide(),this.refresh()},open:function(){$(this.DOMwrap).fadeIn(),e.addClass(document.body,"ov-hidden")},close:function(){$(this.DOMwrap).fadeOut(),e.removeClass(document.body,"ov-hidden")},refresh:function(){var e=this;e.DOM.style.width=e.opt.size[e.id].width+"px",e.DOM.style.minHeight=e.opt.size[e.id].height+"px",e.DOM.style.marginLeft=-(e.opt.size[e.id].width/2)+"px",e.DOM.style.marginTop=-(e.opt.size[e.id].height/2)+"px"}},e.SEOhide={seoContent:{},seoHrefs:{},decode:function(e){for(var t=$("["+e+"]"),s=0,o=t.length;o>s;s++){var i=t.eq(s),a=i.attr("data-hash");switch(i.data("type")){case"href":i.attr("href",Base64.decode(this.seoHrefs[a]));break;case"content":i.replaceWith(Base64.decode(this.seoContent[a]))}}}},e}();
\ No newline at end of file
diff --git a/templates/client/static_client/js_min/_modules/page.exposition.object.min.js b/templates/client/static_client/js_min/_modules/page.exposition.object.min.js
index 7b3efd55..63c4b5d3 100644
--- a/templates/client/static_client/js_min/_modules/page.exposition.object.min.js
+++ b/templates/client/static_client/js_min/_modules/page.exposition.object.min.js
@@ -1 +1 @@
-var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t=EXPO.common,n={},o=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return o.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var n,o={},e=this,i=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};o[this.inputName]=this.DOMinput.value,n=t.getRequest(o,this.url,i)}},n.opt={},$(function(){}),n.init=function(n){$.extend(this.opt,n);var e=this,i=$(document.getElementById(e.opt.visitButton.visitorsListId)),s=$(document.getElementById(e.opt.visitButton.wrapId));this.notes=[],i.children().length||s.show(),$("."+this.opt.note.wrapClass).each(function(){var t=new o(this,e.opt.note);e.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,$(function(){$("."+e.opt.seoLinksClass).each(function(){var n=$(e).attr("data-hash"),o=$(e).attr("data-url");t.SEOhide.seoHrefs[n]=o}),t.SEOhide.decode(e.opt.dataKey)})},n}();
\ No newline at end of file
+var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t=EXPO.common,n={},o=function(t,n){this.opt=n,this.DOMthis=t,this.DOMbutton=t.querySelector("."+n.buttonClass),this.DOMinput=t.querySelector("."+n.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return o.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var n,o={},e=this,i=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};o[this.inputName]=this.DOMinput.value,n=t.getRequest(o,this.url,i)}},n.opt={},$(function(){}),n.init=function(n){$.extend(this.opt,n);var e=this,i=$(document.getElementById(e.opt.visitButton.visitorsListId)),s=$(document.getElementById(e.opt.visitButton.wrapId));this.notes=[],i.children().length||s.show(),$("."+this.opt.note.wrapClass).each(function(){var t=new o(this,e.opt.note);e.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),t.opt.addCalendarText=this.opt.addCalendarText,t.opt.removeCalendarText=this.opt.removeCalendarText,$(function(){$("."+e.opt.seoLinksClass).each(function(){var n=$(this).attr("data-hash"),o=$(this).attr("data-url");t.SEOhide.seoHrefs[n]=o}),t.SEOhide.decode(e.opt.dataKey)})},n}();
\ No newline at end of file