expo-20 tested

templates/client/gulpfile.js

@@ -51,7 +51,7 @@ gulp.task('make-vendor-css', function () {
 });
 gulp.task('main-css', function () {
    gulp.src('static_client/css/main.css')
-	   .pipe(newer('static_client/css/'))
+	   .pipe(newer('static_client/css_min/'))
 	   .pipe(autoprefixer({
 		   browsers:['> 1%', 'Opera > 11', 'Explorer >= 8', 'Firefox >20', 'Chrome > 20']
 	   }))

templates/client/includes/accounts/current_user.html

@@ -314,9 +314,7 @@
                             <div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div>
                         </div>
                         <div class="ic-tel p-editable editable-wrap hidden">
-                            {% if phone_form.phone.value %}
                             <span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span>
-                            {% endif %}
                             <div class="edit-wrap">
                                 <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
                                 <div class="e-form">

templates/client/static_client/css/main.css

@@ -12892,6 +12892,10 @@ hr + .rq-note {
 			background: #ff6600 url(../img/sprites.png) -136px -145px no-repeat;
 
 		}
+	.edit-profile .i-contacts .ic-tel{
+		margin-bottom: 15px;
+		height: 25px;
+	}
 	/*.create-company-modal .select-input.err:before{*/
 		/*margin-right: 0;*/
 	/*}*/

templates/client/static_client/js/_modules/page.profile.js

@@ -268,12 +268,10 @@ if (EXPO.profile){
 										$img.parent('a').attr('href',inputValue);
 										imgSrc = $img.attr('src').replace('_hover','');
 										$img.attr('src',imgSrc);
-	//									$('.p-editable').removeClass('pe-current');
 									}else {
 										imgSrc = $img.attr('src').replace('_hover','');
 										$img.attr('src',imgSrc);
 										$img.wrap('<a href="'+inputValue+'" target="_blank"></a>');
-	//									$('.p-editable').removeClass('pe-current');
 									}
 								}
 							}else if($input.length){
@@ -392,20 +390,21 @@ if (EXPO.profile){
 							},
 							//clearIncomplete: true,
 							showMaskOnHover: false,
-							autoUnmask: true
+							autoUnmask: true//,
+							//placeholder:'+_(___)___-__-__'
 						},
 						match: /[0-9]/,
 						replace: '#',
 						list: maskList,
 						listKey: "mask",
 						onMaskChange: function(maskObj, determined) {
-							$(this).attr("placeholder", $(this).inputmask("getemptymask"));
+							$(this).attr("placeholder", '+_(___)___-__-__');
 						}
 					},
 					selector = '#'+inputId;
 
-					$(selector).attr('placeholder', '+_(___)___-__-__');
 					$(selector).inputmasks(maskOpts);
+					//$(selector).attr('placeholder', '+_(___)___-__-__');
 
 				};
 			this.forms = {};
@@ -562,11 +561,11 @@ if (EXPO.profile){
 						});
 						$editable.toggleClass(self.opt.formCurrentClass);
 
-						//todo: custom click event
 						$(document).on('click.form', function(event) {
 							var targetObj = $(event.target);
 							if (targetObj.parents().filter('.e-form').length < 1) {
 								$editable.removeClass(self.opt.formCurrentClass);
+								self.forms[formName].refreshState();
 								$(document).off('click.form');
 							}
 						});