From e9fbb2db337b3f4eadbff5ceb49aa0c5af39eb92 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Fri, 27 Mar 2015 17:28:51 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/frontend/components/blog/js/blog-add.js | 2 +- application/frontend/components/comment/js/comment.js | 2 +- application/frontend/components/favourite/js/favourite.js | 6 +++--- application/frontend/components/photo/js/photo.js | 2 +- application/frontend/components/poll/js/poll-manage.js | 2 +- application/frontend/components/report/js/report.js | 2 +- .../components/toolbar-scrollnav/js/toolbar.scrollnav.js | 2 +- application/frontend/components/topic/js/topic-add.js | 2 +- application/frontend/components/vote/js/vote.js | 4 ++-- application/frontend/components/wall/js/wall-entry.js | 4 ++-- application/frontend/components/wall/js/wall.js | 2 +- application/frontend/skin/developer/assets/js/init.js | 4 ++-- framework | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/application/frontend/components/blog/js/blog-add.js b/application/frontend/components/blog/js/blog-add.js index aecc53d3..8ed5a2c1 100644 --- a/application/frontend/components/blog/js/blog-add.js +++ b/application/frontend/components/blog/js/blog-add.js @@ -19,7 +19,7 @@ // Селекторы selectors: { type: '.js-blog-add-type', - type_note: '.js-blog-add-field-type .js-field-note', + type_note: '.js-blog-add-field-type .js-field-note' } }, diff --git a/application/frontend/components/comment/js/comment.js b/application/frontend/components/comment/js/comment.js index 9102213e..36443bea 100644 --- a/application/frontend/components/comment/js/comment.js +++ b/application/frontend/components/comment/js/comment.js @@ -25,7 +25,7 @@ vote: aRouter.ajax + 'vote/comment/', favourite: aRouter.ajax + 'favourite/comment/', // Показать/скрыть комментарий - toggle: aRouter.ajax + 'comment/delete/', + toggle: aRouter.ajax + 'comment/delete/' }, // Селекторы diff --git a/application/frontend/components/favourite/js/favourite.js b/application/frontend/components/favourite/js/favourite.js index ae7bea63..12b4dc24 100644 --- a/application/frontend/components/favourite/js/favourite.js +++ b/application/frontend/components/favourite/js/favourite.js @@ -20,7 +20,7 @@ // Ссылки urls: { // Добавить/удалить из избранного - toggle: null, + toggle: null }, // Селекторы @@ -36,11 +36,11 @@ // Добавлено в избранное added: 'favourite--added', // Кол-во добавивших в избранное больше нуля - has_counter: 'favourite--has-counter', + has_counter: 'favourite--has-counter' }, // Параметры отправляемые при каждом аякс запросе - params: {}, + params: {} // Коллбэки diff --git a/application/frontend/components/photo/js/photo.js b/application/frontend/components/photo/js/photo.js index 9ecadeeb..e37cff29 100644 --- a/application/frontend/components/photo/js/photo.js +++ b/application/frontend/components/photo/js/photo.js @@ -24,7 +24,7 @@ crop_avatar: null, save_photo: null, save_avatar: null, - cancel_photo: null, + cancel_photo: null }, use_avatar: true, crop_photo: { diff --git a/application/frontend/components/poll/js/poll-manage.js b/application/frontend/components/poll/js/poll-manage.js index 3e38de09..918e2018 100644 --- a/application/frontend/components/poll/js/poll-manage.js +++ b/application/frontend/components/poll/js/poll-manage.js @@ -60,7 +60,7 @@ item_text: '.js-poll-form-answer-item-text', item_remove: '.js-poll-form-answer-item-remove', submit: '.js-poll-form-submit' - }, + } }, // Максимальное кол-во вариантов которое можно добавить в опрос max: 20 diff --git a/application/frontend/components/report/js/report.js b/application/frontend/components/report/js/report.js index 5aa42ea0..6f00b53b 100644 --- a/application/frontend/components/report/js/report.js +++ b/application/frontend/components/report/js/report.js @@ -21,7 +21,7 @@ // Ссылки urls: { modal: null, - add: null, + add: null }, // Селекторы diff --git a/application/frontend/components/toolbar-scrollnav/js/toolbar.scrollnav.js b/application/frontend/components/toolbar-scrollnav/js/toolbar.scrollnav.js index b137d200..ea264a04 100644 --- a/application/frontend/components/toolbar-scrollnav/js/toolbar.scrollnav.js +++ b/application/frontend/components/toolbar-scrollnav/js/toolbar.scrollnav.js @@ -41,7 +41,7 @@ item: '.js-topic', // Пагинация - pagination: '.js-pagination-topics', + pagination: '.js-pagination-topics' }, // Продолжительность прокрутки, мс diff --git a/application/frontend/components/topic/js/topic-add.js b/application/frontend/components/topic/js/topic-add.js index eba21c19..d2be6f1b 100644 --- a/application/frontend/components/topic/js/topic-add.js +++ b/application/frontend/components/topic/js/topic-add.js @@ -58,7 +58,7 @@ preview: this.element.find( this.option( 'selectors.buttons.preview' ) ), preview_hide: $( this.option( 'selectors.buttons.preview_hide' ) ), draft: this.element.find( this.option( 'selectors.buttons.draft' ) ), - submit: this.element.find( this.option( 'selectors.buttons.submit' ) ), + submit: this.element.find( this.option( 'selectors.buttons.submit' ) ) } }; diff --git a/application/frontend/components/vote/js/vote.js b/application/frontend/components/vote/js/vote.js index 1bdd4b37..936c7935 100644 --- a/application/frontend/components/vote/js/vote.js +++ b/application/frontend/components/vote/js/vote.js @@ -29,7 +29,7 @@ // Кнопки голосования item: '.js-vote-item', // Рейтинг - rating: '.js-vote-rating', + rating: '.js-vote-rating' }, // Классы @@ -53,7 +53,7 @@ count_zero: 'vote--count-zero', // Рейтинг скрыт - rating_hidden: 'vote--rating-hidden', + rating_hidden: 'vote--rating-hidden' }, // Параметры отправляемые при каждом аякс запросе params: {}, diff --git a/application/frontend/components/wall/js/wall-entry.js b/application/frontend/components/wall/js/wall-entry.js index 781a2a9c..d712ebd9 100644 --- a/application/frontend/components/wall/js/wall-entry.js +++ b/application/frontend/components/wall/js/wall-entry.js @@ -27,7 +27,7 @@ selectors: { wrapper: '.js-wall-entry-container', remove: '.js-comment-remove', - reply: '.js-comment-reply', + reply: '.js-comment-reply' }, params: {} @@ -107,6 +107,6 @@ this.option( 'wall' ).lsWall( 'getCommentWrapperById', this.id ).fadeOut( 'slow', function () { $( this ).remove(); }); - }, + } }); })(jQuery); \ No newline at end of file diff --git a/application/frontend/components/wall/js/wall.js b/application/frontend/components/wall/js/wall.js index 4469be55..b9a966b4 100644 --- a/application/frontend/components/wall/js/wall.js +++ b/application/frontend/components/wall/js/wall.js @@ -88,7 +88,7 @@ selectors: { wrapper: _this.option( 'selectors.comment_wrapper' ), remove: _this.option( 'selectors.entry.remove' ), - reply: _this.option( 'selectors.entry.reply' ), + reply: _this.option( 'selectors.entry.reply' ) } }) }); diff --git a/application/frontend/skin/developer/assets/js/init.js b/application/frontend/skin/developer/assets/js/init.js index ddaac4af..e80cda06 100644 --- a/application/frontend/skin/developer/assets/js/init.js +++ b/application/frontend/skin/developer/assets/js/init.js @@ -339,7 +339,7 @@ jQuery(document).ready(function($){ $('.js-user-report').lsReport({ urls: { modal: aRouter.profile + 'ajax-modal-complaint', - add: aRouter.profile + 'ajax-complaint-add', + add: aRouter.profile + 'ajax-complaint-add' } }); @@ -497,7 +497,7 @@ jQuery(document).ready(function($){ }, use_avatar: false, crop_photo: { - minSize: [ 500, 500 ], + minSize: [ 100, 100 ], aspectRatio: 1, usePreview: true } diff --git a/framework b/framework index 661a71ba..3c5d2b05 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 661a71ba2295fe2f0e70aef5e7eb6d8bae0a249e +Subproject commit 3c5d2b051b5380d58ff83c1b392cd8f22f1e84c0