Update content of files

This commit is contained in:
GitHub Action 2024-06-22 18:29:21 +00:00
parent d577b6c18e
commit 2f0ab00229
7 changed files with 163 additions and 47 deletions

View file

@ -24,7 +24,7 @@
<link href="//telegram.org/css/bootstrap-extra.css?2" rel="stylesheet">
<link href="//telegram.org/css/telegram.css?237" rel="stylesheet">
<link href="//telegram.org/css/widget-frame.css?67" rel="stylesheet">
<link href="//telegram.org/css/promote.css?93" rel="stylesheet">
<link href="//telegram.org/css/promote.css?94" rel="stylesheet">
<link href="//telegram.org/css/jquery-ui.min.css?1" rel="stylesheet">
<link href="//telegram.org/css/tchart.min.css?10" rel="stylesheet">
@ -33,6 +33,7 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
<defs>
<path id="icon-currency-ton" d="m2.68 4h10.63c.22 0 .4.18.4.41 0 .07-.01.14-.05.2l-5.04 9.08c-.22.4-.72.54-1.11.32-.14-.08-.25-.19-.32-.33l-4.87-9.08c-.1-.2-.03-.45.17-.55.06-.03.12-.05.19-.05zm5.32 9.78v-9.78z" fill="none" stroke="currentColor" stroke-width="1.3"/>
<path id="icon-currency-stars" d="M 5.84 5.42 L 7.35 2.39 C 7.53 2.04 7.95 1.9 8.28 2.07 C 8.42 2.15 8.53 2.25 8.6 2.4 L 10.03 5.32 C 10.15 5.55 10.37 5.71 10.64 5.75 L 13.63 6.11 C 14.03 6.16 14.32 6.53 14.27 6.93 C 14.25 7.1 14.17 7.27 14.05 7.39 L 11.7 9.73 C 11.59 9.82 11.55 9.96 11.56 10.09 L 11.96 13.25 C 12.01 13.71 11.7 14.12 11.24 14.17 C 11.08 14.19 10.91 14.16 10.76 14.08 L 8.26 12.72 C 8.07 12.6 7.86 12.6 7.69 12.71 L 5.09 14.04 C 4.72 14.22 4.28 14.08 4.09 13.71 C 4.03 13.58 4 13.42 4.03 13.26 L 4.23 11.82 C 4.33 11.1 4.77 10.49 5.4 10.17 L 8.27 8.69 C 8.36 8.64 8.38 8.55 8.35 8.47 C 8.3 8.41 8.24 8.38 8.18 8.39 L 4.67 8.9 C 4.13 8.98 3.59 8.82 3.17 8.47 L 2 7.51 C 1.66 7.25 1.62 6.75 1.88 6.41 C 2.02 6.25 2.19 6.16 2.39 6.12 L 5.39 5.74 C 5.58 5.71 5.75 5.59 5.84 5.42 Z" fill="currentColor"/>
</defs>
</svg>
<div id="aj_progress" class="progress-bar"></div>
@ -128,14 +129,14 @@
<script src="//telegram.org/js/main-aj.js?69"></script>
<script src="//telegram.org/js/main.js?47"></script>
<script src="//telegram.org/js/widget-frame.js?62"></script>
<script src="//telegram.org/js/promote.js?88"></script>
<script src="//telegram.org/js/promote.js?89"></script>
<script src="//telegram.org/js/jquery-ui.min.js?1"></script>
<script src="//telegram.org/js/jquery-ex.js?18"></script>
<script src="//telegram.org/js/tchart.min.js?18"></script>
<script src="//telegram.org/js/health.js?19"></script>
<script src="//telegram.org/js/health.js?20"></script>
<script src="//telegram.org/js/tgsticker.js?31"></script>
<script>ajInit({"version":1004,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script>ajInit({"version":1007,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script id="aj_script">l.add({"WEB_AB_WARNING_HEADER":"Turn off ad blocker","WEB_POPUP_CLOSE_BTN":"Close","WEB_AB_WARNING_TEXT":"You appear to be using an ad blocker that may prevent pages on the Telegram Ad Platform from working as expected.<br\/><br\/>Please turn off your ad blocker or add <b>ads.telegram.org<\/b> as an exception to manage your promoted messages."});
Ads.init();
Aj.onLoad(function(state) {

View file

@ -24,7 +24,7 @@
<link href="//telegram.org/css/bootstrap-extra.css?2" rel="stylesheet">
<link href="//telegram.org/css/telegram.css?237" rel="stylesheet">
<link href="//telegram.org/css/widget-frame.css?67" rel="stylesheet">
<link href="//telegram.org/css/promote.css?93" rel="stylesheet">
<link href="//telegram.org/css/promote.css?94" rel="stylesheet">
<link href="//telegram.org/css/jquery-ui.min.css?1" rel="stylesheet">
<link href="//telegram.org/css/tchart.min.css?10" rel="stylesheet">
@ -33,6 +33,7 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
<defs>
<path id="icon-currency-ton" d="m2.68 4h10.63c.22 0 .4.18.4.41 0 .07-.01.14-.05.2l-5.04 9.08c-.22.4-.72.54-1.11.32-.14-.08-.25-.19-.32-.33l-4.87-9.08c-.1-.2-.03-.45.17-.55.06-.03.12-.05.19-.05zm5.32 9.78v-9.78z" fill="none" stroke="currentColor" stroke-width="1.3"/>
<path id="icon-currency-stars" d="M 5.84 5.42 L 7.35 2.39 C 7.53 2.04 7.95 1.9 8.28 2.07 C 8.42 2.15 8.53 2.25 8.6 2.4 L 10.03 5.32 C 10.15 5.55 10.37 5.71 10.64 5.75 L 13.63 6.11 C 14.03 6.16 14.32 6.53 14.27 6.93 C 14.25 7.1 14.17 7.27 14.05 7.39 L 11.7 9.73 C 11.59 9.82 11.55 9.96 11.56 10.09 L 11.96 13.25 C 12.01 13.71 11.7 14.12 11.24 14.17 C 11.08 14.19 10.91 14.16 10.76 14.08 L 8.26 12.72 C 8.07 12.6 7.86 12.6 7.69 12.71 L 5.09 14.04 C 4.72 14.22 4.28 14.08 4.09 13.71 C 4.03 13.58 4 13.42 4.03 13.26 L 4.23 11.82 C 4.33 11.1 4.77 10.49 5.4 10.17 L 8.27 8.69 C 8.36 8.64 8.38 8.55 8.35 8.47 C 8.3 8.41 8.24 8.38 8.18 8.39 L 4.67 8.9 C 4.13 8.98 3.59 8.82 3.17 8.47 L 2 7.51 C 1.66 7.25 1.62 6.75 1.88 6.41 C 2.02 6.25 2.19 6.16 2.39 6.12 L 5.39 5.74 C 5.58 5.71 5.75 5.59 5.84 5.42 Z" fill="currentColor"/>
</defs>
</svg>
<div id="aj_progress" class="progress-bar"></div>
@ -128,14 +129,14 @@
<script src="//telegram.org/js/main-aj.js?69"></script>
<script src="//telegram.org/js/main.js?47"></script>
<script src="//telegram.org/js/widget-frame.js?62"></script>
<script src="//telegram.org/js/promote.js?88"></script>
<script src="//telegram.org/js/promote.js?89"></script>
<script src="//telegram.org/js/jquery-ui.min.js?1"></script>
<script src="//telegram.org/js/jquery-ex.js?18"></script>
<script src="//telegram.org/js/tchart.min.js?18"></script>
<script src="//telegram.org/js/health.js?19"></script>
<script src="//telegram.org/js/health.js?20"></script>
<script src="//telegram.org/js/tgsticker.js?31"></script>
<script>ajInit({"version":1004,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script>ajInit({"version":1007,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script id="aj_script">l.add({"WEB_AB_WARNING_HEADER":"Turn off ad blocker","WEB_POPUP_CLOSE_BTN":"Close","WEB_AB_WARNING_TEXT":"You appear to be using an ad blocker that may prevent pages on the Telegram Ad Platform from working as expected.<br\/><br\/>Please turn off your ad blocker or add <b>ads.telegram.org<\/b> as an exception to manage your promoted messages."});
openPopup('#login-popup-container');
Ads.init();

View file

@ -23,7 +23,7 @@
<link href="//telegram.org/css/bootstrap-extra.css?2" rel="stylesheet">
<link href="//telegram.org/css/telegram.css?237" rel="stylesheet">
<link href="//telegram.org/css/widget-frame.css?67" rel="stylesheet">
<link href="//telegram.org/css/promote.css?93" rel="stylesheet">
<link href="//telegram.org/css/promote.css?94" rel="stylesheet">
<link href="//telegram.org/css/jquery-ui.min.css?1" rel="stylesheet">
<link href="//telegram.org/css/tchart.min.css?10" rel="stylesheet">
@ -32,6 +32,7 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
<defs>
<path id="icon-currency-ton" d="m2.68 4h10.63c.22 0 .4.18.4.41 0 .07-.01.14-.05.2l-5.04 9.08c-.22.4-.72.54-1.11.32-.14-.08-.25-.19-.32-.33l-4.87-9.08c-.1-.2-.03-.45.17-.55.06-.03.12-.05.19-.05zm5.32 9.78v-9.78z" fill="none" stroke="currentColor" stroke-width="1.3"/>
<path id="icon-currency-stars" d="M 5.84 5.42 L 7.35 2.39 C 7.53 2.04 7.95 1.9 8.28 2.07 C 8.42 2.15 8.53 2.25 8.6 2.4 L 10.03 5.32 C 10.15 5.55 10.37 5.71 10.64 5.75 L 13.63 6.11 C 14.03 6.16 14.32 6.53 14.27 6.93 C 14.25 7.1 14.17 7.27 14.05 7.39 L 11.7 9.73 C 11.59 9.82 11.55 9.96 11.56 10.09 L 11.96 13.25 C 12.01 13.71 11.7 14.12 11.24 14.17 C 11.08 14.19 10.91 14.16 10.76 14.08 L 8.26 12.72 C 8.07 12.6 7.86 12.6 7.69 12.71 L 5.09 14.04 C 4.72 14.22 4.28 14.08 4.09 13.71 C 4.03 13.58 4 13.42 4.03 13.26 L 4.23 11.82 C 4.33 11.1 4.77 10.49 5.4 10.17 L 8.27 8.69 C 8.36 8.64 8.38 8.55 8.35 8.47 C 8.3 8.41 8.24 8.38 8.18 8.39 L 4.67 8.9 C 4.13 8.98 3.59 8.82 3.17 8.47 L 2 7.51 C 1.66 7.25 1.62 6.75 1.88 6.41 C 2.02 6.25 2.19 6.16 2.39 6.12 L 5.39 5.74 C 5.58 5.71 5.75 5.59 5.84 5.42 Z" fill="currentColor"/>
</defs>
</svg>
<div id="aj_progress" class="progress-bar"></div>
@ -254,14 +255,14 @@
<script src="//telegram.org/js/main-aj.js?69"></script>
<script src="//telegram.org/js/main.js?47"></script>
<script src="//telegram.org/js/widget-frame.js?62"></script>
<script src="//telegram.org/js/promote.js?88"></script>
<script src="//telegram.org/js/promote.js?89"></script>
<script src="//telegram.org/js/jquery-ui.min.js?1"></script>
<script src="//telegram.org/js/jquery-ex.js?18"></script>
<script src="//telegram.org/js/tchart.min.js?18"></script>
<script src="//telegram.org/js/health.js?19"></script>
<script src="//telegram.org/js/health.js?20"></script>
<script src="//telegram.org/js/tgsticker.js?31"></script>
<script>ajInit({"version":1004,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script>ajInit({"version":1007,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script id="aj_script">l.add({"WEB_AB_WARNING_HEADER":"Turn off ad blocker","WEB_POPUP_CLOSE_BTN":"Close","WEB_AB_WARNING_TEXT":"You appear to be using an ad blocker that may prevent pages on the Telegram Ad Platform from working as expected.<br\/><br\/>Please turn off your ad blocker or add <b>ads.telegram.org<\/b> as an exception to manage your promoted messages."});
window.initDevPageNav&&initDevPageNav();
window.enableInlineVideo&&$('video').each(function(){enableInlineVideo(this)});

View file

@ -24,7 +24,7 @@
<link href="//telegram.org/css/bootstrap-extra.css?2" rel="stylesheet">
<link href="//telegram.org/css/telegram.css?237" rel="stylesheet">
<link href="//telegram.org/css/widget-frame.css?67" rel="stylesheet">
<link href="//telegram.org/css/promote.css?93" rel="stylesheet">
<link href="//telegram.org/css/promote.css?94" rel="stylesheet">
<link href="//telegram.org/css/jquery-ui.min.css?1" rel="stylesheet">
<link href="//telegram.org/css/tchart.min.css?10" rel="stylesheet">
@ -33,6 +33,7 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display:none">
<defs>
<path id="icon-currency-ton" d="m2.68 4h10.63c.22 0 .4.18.4.41 0 .07-.01.14-.05.2l-5.04 9.08c-.22.4-.72.54-1.11.32-.14-.08-.25-.19-.32-.33l-4.87-9.08c-.1-.2-.03-.45.17-.55.06-.03.12-.05.19-.05zm5.32 9.78v-9.78z" fill="none" stroke="currentColor" stroke-width="1.3"/>
<path id="icon-currency-stars" d="M 5.84 5.42 L 7.35 2.39 C 7.53 2.04 7.95 1.9 8.28 2.07 C 8.42 2.15 8.53 2.25 8.6 2.4 L 10.03 5.32 C 10.15 5.55 10.37 5.71 10.64 5.75 L 13.63 6.11 C 14.03 6.16 14.32 6.53 14.27 6.93 C 14.25 7.1 14.17 7.27 14.05 7.39 L 11.7 9.73 C 11.59 9.82 11.55 9.96 11.56 10.09 L 11.96 13.25 C 12.01 13.71 11.7 14.12 11.24 14.17 C 11.08 14.19 10.91 14.16 10.76 14.08 L 8.26 12.72 C 8.07 12.6 7.86 12.6 7.69 12.71 L 5.09 14.04 C 4.72 14.22 4.28 14.08 4.09 13.71 C 4.03 13.58 4 13.42 4.03 13.26 L 4.23 11.82 C 4.33 11.1 4.77 10.49 5.4 10.17 L 8.27 8.69 C 8.36 8.64 8.38 8.55 8.35 8.47 C 8.3 8.41 8.24 8.38 8.18 8.39 L 4.67 8.9 C 4.13 8.98 3.59 8.82 3.17 8.47 L 2 7.51 C 1.66 7.25 1.62 6.75 1.88 6.41 C 2.02 6.25 2.19 6.16 2.39 6.12 L 5.39 5.74 C 5.58 5.71 5.75 5.59 5.84 5.42 Z" fill="currentColor"/>
</defs>
</svg>
<div id="aj_progress" class="progress-bar"></div>
@ -173,14 +174,14 @@
<script src="//telegram.org/js/main-aj.js?69"></script>
<script src="//telegram.org/js/main.js?47"></script>
<script src="//telegram.org/js/widget-frame.js?62"></script>
<script src="//telegram.org/js/promote.js?88"></script>
<script src="//telegram.org/js/promote.js?89"></script>
<script src="//telegram.org/js/jquery-ui.min.js?1"></script>
<script src="//telegram.org/js/jquery-ex.js?18"></script>
<script src="//telegram.org/js/tchart.min.js?18"></script>
<script src="//telegram.org/js/health.js?19"></script>
<script src="//telegram.org/js/health.js?20"></script>
<script src="//telegram.org/js/tgsticker.js?31"></script>
<script>ajInit({"version":1004,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script>ajInit({"version":1007,"apiUrl":"\/api?hash=telegram-crawler","unauth":true});</script>
<script id="aj_script">l.add({"WEB_AB_WARNING_HEADER":"Turn off ad blocker","WEB_POPUP_CLOSE_BTN":"Close","WEB_AB_WARNING_TEXT":"You appear to be using an ad blocker that may prevent pages on the Telegram Ad Platform from working as expected.<br\/><br\/>Please turn off your ad blocker or add <b>ads.telegram.org<\/b> as an exception to manage your promoted messages."});
window.enableInlineVideo&&$('video').each(function(){enableInlineVideo(this)});
Ads.init();

View file

@ -500,6 +500,16 @@ a:hover img.emoji {
user-select: none;
}
.text-nowrap {
display: flex;
white-space: nowrap;
}
.text-nowrap > .text-cut {
text-overflow: ellipsis;
overflow: hidden;
flex-shrink: 1;
}
.select {
position: relative;
box-shadow: inset 0 -1px 0 #f0f0f0;
@ -702,7 +712,7 @@ a:hover img.emoji {
}
@media (max-width: 991px) {
.mobile-hide {
display: none;
display: none !important;
}
}
@media (min-width: 992px) {
@ -912,6 +922,13 @@ a:hover img.emoji {
margin-left: 50px;
margin-right: 15px;
}
.pr-header-account-name {
display: inline-block;
vertical-align: top;
text-overflow: ellipsis;
overflow: hidden;
max-width: 180px;
}
.pr-dropdown-item-photo {
position: absolute;
display: inline-block;
@ -1348,7 +1365,7 @@ body.rtl .pr-search-reset {
.pr-owner-balance-wrap {
display: inline-block;
vertical-align: top;
max-width: 240px;
max-width: 100%;
padding: 0 1px;
margin-right: 10px;
border-radius: 6px;
@ -2440,7 +2457,8 @@ a.pr-account-button-wrap:focus {
.pr-form-control-wrap .pr-form-control-prefix .currency-euro {
letter-spacing: normal;
}
.pr-form-control-wrap .pr-form-control-prefix .currency-ton {
.pr-form-control-wrap .pr-form-control-prefix .currency-ton,
.pr-form-control-wrap .pr-form-control-prefix .currency-stars {
color: var(--accent-color);
margin-left: 0;
margin-right: 0;
@ -4819,7 +4837,8 @@ a.pr-popup-account:hover {
.amount-currency.currency-euro {
letter-spacing: 0.17em;
}
.amount-currency.currency-ton {
.amount-currency.currency-ton,
.amount-currency.currency-stars {
position: relative;
display: inline-block;
vertical-align: top;
@ -4831,7 +4850,8 @@ a.pr-popup-account:hover {
text-indent: -500%;
overflow: hidden;
}
.amount-currency.currency-ton svg.currency-ton-icon {
.amount-currency.currency-ton svg.currency-ton-icon,
.amount-currency.currency-stars svg.currency-stars-icon {
position: absolute;
left: 0;
top: 0;
@ -4841,6 +4861,13 @@ a.pr-popup-account:hover {
vertical-align: top;
height: auto;
}
.amount-currency.currency-stars svg.currency-stars-icon use {
display: none;
}
.amount-currency.currency-stars svg.currency-stars-icon {
background: url('data:image/svg+xml,%3Csvg%20height%3D%2218%22%20viewBox%3D%220%200%2016%2018%22%20width%3D%2216%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22a%22%20x1%3D%2225%25%22%20x2%3D%2274.92%25%22%20y1%3D%22.825%25%22%20y2%3D%22107.86%25%22%3E%3Cstop%20offset%3D%220%22%20stop-color%3D%22%23ffd951%22%2F%3E%3Cstop%20offset%3D%221%22%20stop-color%3D%22%23ffb222%22%2F%3E%3C%2FlinearGradient%3E%3ClinearGradient%20id%3D%22b%22%20x1%3D%2250%25%22%20x2%3D%2250%25%22%20y1%3D%220%25%22%20y2%3D%2299.795%25%22%3E%3Cstop%20offset%3D%220%22%20stop-color%3D%22%23e58f0d%22%2F%3E%3Cstop%20offset%3D%22.99963%22%20stop-color%3D%22%23eb7915%22%2F%3E%3C%2FlinearGradient%3E%3Cpath%20id%3D%22c%22%20d%3D%22m5.93%205.39%201.48-2.97c.17-.34.58-.48.92-.31.13.07.24.18.31.31l1.4%202.87c.11.23.34.39.59.42l2.93.36c.4.04.68.41.63.81-.01.16-.09.32-.21.44l-2.31%202.29c-.1.1-.14.23-.13.36l.39%203.1c.05.45-.26.85-.7.9-.16.03-.33-.01-.48-.08l-2.45-1.35c-.17-.1-.39-.1-.56-.01l-2.54%201.31c-.36.19-.79.04-.98-.32-.07-.14-.09-.29-.07-.44l.2-1.42c.1-.7.53-1.3%201.15-1.62l2.82-1.45c.07-.04.1-.13.06-.2-.03-.06-.09-.1-.16-.09l-3.44.5c-.53.08-1.06-.08-1.47-.41l-1.15-.94c-.33-.27-.38-.76-.11-1.09.12-.15.3-.25.5-.28l2.94-.38c.19-.02.35-.14.44-.31z%22%2F%3E%3Cfilter%20id%3D%22d%22%20height%3D%22111.7%25%22%20width%3D%22111.4%25%22%20x%3D%22-5.7%25%22%20y%3D%22-5.9%25%22%3E%3CfeOffset%20dx%3D%22.56%22%20dy%3D%22.84%22%20in%3D%22SourceAlpha%22%20result%3D%22shadowOffsetInner1%22%2F%3E%3CfeComposite%20in%3D%22shadowOffsetInner1%22%20in2%3D%22SourceAlpha%22%20k2%3D%22-1%22%20k3%3D%221%22%20operator%3D%22arithmetic%22%20result%3D%22shadowInnerInner1%22%2F%3E%3CfeColorMatrix%20in%3D%22shadowInnerInner1%22%20type%3D%22matrix%22%20values%3D%220%200%200%200%201%20%20%200%200%200%200%201%20%20%200%200%200%200%201%20%200%200%200%200.65667938%200%22%2F%3E%3C%2Ffilter%3E%3C%2Fdefs%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cuse%20fill%3D%22url%28%23a%29%22%20fill-rule%3D%22evenodd%22%20xlink%3Ahref%3D%22%23c%22%2F%3E%3Cuse%20fill%3D%22%23000%22%20filter%3D%22url%28%23d%29%22%20xlink%3Ahref%3D%22%23c%22%2F%3E%3Cuse%20stroke%3D%22url%28%23b%29%22%20stroke-width%3D%22.56%22%20xlink%3Ahref%3D%22%23c%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E') center no-repeat;
background-size: contain;
}
@ -5039,13 +5066,14 @@ a.pr-popup-account:hover {
margin: 0 -23px;
overflow: hidden;
}
.pr-similar-channels-loading,
.pr-similar-channels-message,
.pr-similar-channels-list {
max-width: 100%;
width: 360px;
padding: 0 23px;
}
.pr-similar-channels-loading {
.pr-similar-channels-message,
.pr-similar-channels-empty {
display: flex;
align-items: center;
justify-content: center;

View file

@ -167,48 +167,50 @@ function formatNumber(number, decimals, decPoint, thousandsSep) {
return s.join(dec)
}
function statsFormatAxisAmountTpl(tpl, value) {
if (value % 1000000 > 0) {
var decimals = 2;
while (value % Math.pow(10, 6 - decimals)) {
function statsFormatAxisAmountTpl(tpl, factor, value, decimals) {
if (value % factor > 0) {
decimals = decimals || 0;
var max_decimals = Math.log10(factor);
while (value % Math.pow(10, max_decimals - decimals)) {
decimals++;
if (decimals >= 3) break;
}
value = formatNumber(value / 1000000, decimals, '.', ',');
value = formatNumber(value / factor, decimals, '.', ',');
} else {
value = statsFormatKMBT(value / 1000000);
value = statsFormatKMBT(value / factor);
}
return tpl.replace('{value}', value);
}
function statsFormatAxisAmountFn(tpl) {
function statsFormatAxisAmountFn(tpl, factor, decimals) {
return function(value) {
return statsFormatAxisAmountTpl(tpl, value);
return statsFormatAxisAmountTpl(tpl, factor, value, decimals || 0);
};
}
function statsFormatAxisAmount(value) {
return statsFormatAxisAmountTpl('€ {value}', value);
return statsFormatAxisAmountTpl('€ {value}', 1000000, value, 2);
}
function statsFormatAmountTpl(tpl, value) {
var decimals = 2;
while (value % Math.pow(10, 6 - decimals) &&
value < Math.pow(10, 10 - decimals)) {
function statsFormatAmountTpl(tpl, factor, value, decimals) {
decimals = decimals || 0;
var max_decimals = Math.log10(factor);
while (value % Math.pow(10, max_decimals - decimals) &&
value < Math.pow(10, max_decimals + 4 - decimals)) {
decimals++;
}
value = formatNumber(value / 1000000, decimals, '.', ',');
value = formatNumber(value / factor, decimals, '.', ',');
return tpl.replace('{value}', value);
}
function statsFormatAmountFn(tpl) {
function statsFormatAmountFn(tpl, factor, decimals) {
return function(value) {
return statsFormatAmountTpl(tpl, value);
return statsFormatAmountTpl(tpl, factor, value, decimals || 0);
};
}
function statsFormatAmount(value) {
return statsFormatAmountTpl('€ {value}', value);
return statsFormatAmountTpl('€ {value}', 1000000, value, 2);
}
function statsFormat5min(time) {

View file

@ -76,14 +76,21 @@ var Ads = {
if (m < 10) m = '0' + m;
return date_value + 'T' + time_value + (tz_offset ? (is_pos ? '+' : '-') + h + m : 'Z');
},
ownerCurrencyDecimals: function() {
if (typeof Aj.state.ownerCurrencyDecimals === 'undefined') {
return 2;
}
return Aj.state.ownerCurrencyDecimals;
},
wrapAmount: function(value, no_currency, field_format) {
var amount_str = formatNumber(value, 2, '.', field_format ? '' : ',');
var decimals = Ads.ownerCurrencyDecimals();
var amount_str = formatNumber(value, decimals, '.', field_format ? '' : ',');
if (no_currency) {
return amount_str;
}
var currency_str = Aj.state.ownerCurrency || '<span class="amount-currency currency-euro">€</span>';
var parts = amount_str.split('.');
amount_str = parts[0] + (parts[1].length ? '<span class="amount-frac">.' + parts[1] + '</span>' : '');
amount_str = parts[0] + (parts.length > 1 && parts[1].length ? '<span class="amount-frac">.' + parts[1] + '</span>' : '');
return currency_str + amount_str;
},
wrapEurAmount: function(value, field_format) {
@ -96,6 +103,7 @@ var Ads = {
var minValue = $fieldEl.attr('data-min') || null;
var maxValue = $fieldEl.attr('data-max') || null;
var decPoint = $fieldEl.attr('data-dec-point') || '.';
var decimals = $fieldEl.attr('data-decimals') || Ads.ownerCurrencyDecimals();
var value = $fieldEl.value();
var float_value = value.length ? value : '0';
@ -131,7 +139,7 @@ var Ads = {
var minValue = $fieldEl.attr('data-min') || null;
var maxValue = $fieldEl.attr('data-max') || null;
var decPoint = $fieldEl.attr('data-dec-point') || '.';
var decimals = $fieldEl.attr('data-decimals') || 2;
var decimals = $fieldEl.attr('data-decimals') || Ads.ownerCurrencyDecimals();
var sel_dir = this.selectionDirection;
var sel_start = this.selectionStart;
var sel_end = this.selectionEnd;
@ -144,7 +152,7 @@ var Ads = {
var decimal_len = 0;
for (var i = 0; i < value.length; i++) {
var char = value[i];
if ((char == '.' || char == ',') && !has_decimal) {
if ((char == '.' || char == ',') && !has_decimal && decimals > 0) {
if (!chars_len) {
new_value += '0';
if (i < sel_start) new_sel_start++;
@ -152,7 +160,7 @@ var Ads = {
}
has_decimal = true;
new_value += decPoint;
} else if (char >= '0' && char <= '9' && decimal_len < decimals) {
} else if (char >= '0' && char <= '9' && (!has_decimal || decimal_len < decimals)) {
new_value += char;
if (has_decimal) decimal_len++;
else chars_len++;
@ -1104,11 +1112,13 @@ var NewAd = {
closeByClickOutside: '.popup-no-close',
onOpen: function() {
var $list = $('.js-similar-channels-list', this);
var $empty = $('.js-similar-channels-empty', this);
var $loading = $('.js-similar-channels-loading', this);
var $button = $('.js-add-similar-channels', this);
$list.on('scroll', NewAd.onSimiralChannelsScroll);
$list.on('change', 'input.checkbox', NewAd.eSimiralChannelChange);
$button.on('click', NewAd.eAddSimiralChannels);
$empty.addClass('hide');
$button.addClass('hide');
$loading.removeClass('hide');
$list.html('').trigger('scroll').data('channels', {}).addClass('hide');
@ -1120,15 +1130,17 @@ var NewAd = {
return false;
}
if (result.channels) {
$button.removeClass('hide');
var html = '', channel_items = {};
for (var i = 0; i < result.channels.length; i++) {
var item = result.channels[i];
html += item.cb_item;
channel_items['ch' + item.id] = item;
}
var has_items = channel_items > 0;
$empty.toggleClass('hide', has_items);
$button.toggleClass('hide', !has_items);
$loading.addClass('hide');
$list.html(html).data('channel_items', channel_items).removeClass('hide').trigger('scroll');
$list.html(html).data('channel_items', channel_items).toggleClass('hide', !has_items).trigger('scroll');
NewAd.updateSimiralChannelButton();
}
});
@ -2464,6 +2476,70 @@ var Account = {
}
});
return false;
},
initAddStarsPopup: function() {
var cont = Aj.layer;
Aj.onLayerLoad(function(layerState) {
layerState.$form = $('.pr-popup-edit-form', cont);
Ads.formInit(layerState.$form);
layerState.amountField = layerState.$form.field('amount');
Aj.layer.one('popup:open', function() {
layerState.amountField.focusAndSelect(true);
});
layerState.$form.on('submit', Account.eSubmitAddStarsPopupForm);
cont.on('click.curLayer', '.submit-form-btn', Account.eSubmitAddStarsPopupForm);
});
Aj.onLayerUnload(function(layerState) {
Ads.formDestroy(layerState.$form);
layerState.$form.off('submit', Account.eSubmitAddStarsPopupForm);
clearTimeout(Aj.layerState.addStarsTo);
});
},
eSubmitAddStarsPopupForm: function(e) {
e.preventDefault();
var $form = Aj.layerState.$form;
var owner_id = $form.field('owner_id').value();
var amount = Ads.amountFieldValue($form, 'amount');
if ($form.data('disabled')) {
return false;
}
if (amount === false) {
$form.field('amount').focus();
return false;
}
var params = {
owner_id: owner_id,
amount: amount
};
var onSuccess = function(result) {
$form.data('disabled', false);
if (result.error) {
if (result.field) {
var $field = $form.field(result.field);
if ($field.size()) {
Ads.showFieldError($field, result.error, true);
return false;
}
}
return showAlert(result.error);
}
if (result.request_id) {
$form.data('disabled', true);
Aj.layerState.addStarsTo = setTimeout(function() {
params.request_id = result.request_id;
Aj.apiRequest('incrStarsBudget', params, onSuccess);
}, 400);
} else {
closePopup(Aj.layer);
if (result.redirect_to) {
Aj.location(result.redirect_to);
}
}
};
$form.data('disabled', true);
Aj.apiRequest('incrStarsBudget', params, onSuccess);
return false;
}
};
@ -3311,6 +3387,9 @@ var EditAd = {
if (result.ad) {
OwnerAds.updateAd(result.ad);
}
if (result.header_owner_budget) {
$('.js-header_owner_budget').html(result.header_owner_budget);
}
if (result.owner_budget) {
$('.js-owner_budget').html(result.owner_budget);
}
@ -3569,6 +3648,9 @@ var EditAd = {
return showAlert(result.error);
}
Aj.state.$form.reset();
if (result.header_owner_budget) {
$('.js-header_owner_budget').html(result.header_owner_budget);
}
if (result.owner_budget) {
$('.js-owner_budget').html(result.owner_budget);
}