From 6af51f0aed1318a0f769a4cefee07718f97e44a6 Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Thu, 9 Oct 2014 23:42:28 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 9 +++------ templates/skin/default/assets/js/admin_stream.js | 2 +- templates/skin/default/assets/js/init.js | 8 ++++---- templates/skin/default/assets/js/nav.main.js | 4 ++-- templates/skin/default/layouts/layout.base.tpl | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/config/assets.php b/config/assets.php index 4223ae4..e12f55d 100644 --- a/config/assets.php +++ b/config/assets.php @@ -46,10 +46,9 @@ "___path.framework.frontend.web___/js/core/utils.js", "___path.framework.frontend.web___/js/core/timer.js", /* User Interface */ - "___path.framework.frontend.web___/js/ui/dropdown.js", + "___path.skin.web___/components/dropdown/js/dropdown.js", "___path.framework.frontend.web___/js/ui/tab.js", "___path.framework.frontend.web___/js/ui/modal.js", - "___path.framework.frontend.web___/js/ui/toolbar.js", "___path.framework.frontend.web___/js/ui/tooltip.js", "___path.framework.frontend.web___/js/ui/autocomplete.js", "___path.framework.frontend.web___/js/ui/notification.js", @@ -59,7 +58,7 @@ "___path.application.web___/frontend/common/js/favourite.js", "___path.application.web___/frontend/common/js/blocks.js", "___path.application.web___/frontend/common/js/pagination.js", - "___path.application.web___/frontend/common/js/editor.js", + "___path.skin.web___/components/editor/js/editor.js", //"___path.application.web___/frontend/common/js/talk.js", //"___path.application.web___/frontend/common/js/vote.js", //"___path.application.web___/frontend/common/js/poll.js", @@ -72,8 +71,6 @@ "___path.application.web___/frontend/common/js/user.js", //"___path.application.web___/frontend/common/js/userfeed.js", //"___path.application.web___/frontend/common/js/activity.js", - "___path.application.web___/frontend/common/js/toolbar.js", - "___path.application.web___/frontend/common/js/settings.js", "___path.application.web___/frontend/common/js/topic.js", //"___path.application.web___/frontend/common/js/admin.js", //"___path.application.web___/frontend/common/js/userfield.js", @@ -96,7 +93,7 @@ "___path.framework.frontend.web___/css/helpers.css", "___path.framework.frontend.web___/css/text.css", "___path.framework.frontend.web___/css/icons.css", - "___path.framework.frontend.web___/css/dropdowns.css", + "___path.skin.web___/components/dropdown/css/dropdown.css", "___path.framework.frontend.web___/css/buttons.css", "___path.framework.frontend.web___/css/forms.css", "___path.framework.frontend.web___/css/navs.css", diff --git a/templates/skin/default/assets/js/admin_stream.js b/templates/skin/default/assets/js/admin_stream.js index 55b35e8..7fe6a74 100644 --- a/templates/skin/default/assets/js/admin_stream.js +++ b/templates/skin/default/assets/js/admin_stream.js @@ -65,7 +65,7 @@ jQuery(document).ready(function($) { /* спрятать дропдаун */ - $ (ls.admin_stream.selectors.admin_index_activity_dropdown_menu_trigger).dropdown('hide'); + $ (ls.admin_stream.selectors.admin_index_activity_dropdown_menu_trigger).lsDropdown('hide'); }, success: function(data) { if (data.bStateError) { diff --git a/templates/skin/default/assets/js/init.js b/templates/skin/default/assets/js/init.js index 1130d0e..0ee3ddf 100644 --- a/templates/skin/default/assets/js/init.js +++ b/templates/skin/default/assets/js/init.js @@ -66,7 +66,7 @@ jQuery(document).ready(function($) { /** * Dropdowns */ - $('.js-dropdown').dropdown({ + $('.js-dropdown').lsDropdown({ position: { my: "right+10 top+10", at: "right bottom", @@ -83,7 +83,7 @@ jQuery(document).ready(function($) { /* используется для списка сортировок столбца таблицы */ - $('.js-dropdown-left-bottom').dropdown({ + $('.js-dropdown-left-bottom').lsDropdown({ position: { my: "left-10 top+10", at: "left bottom", @@ -99,7 +99,7 @@ jQuery(document).ready(function($) { }); /* Юзербар */ - $('.js-dropdown-userbar').dropdown({ + $('.js-dropdown-userbar').lsDropdown({ position: { my: "right top", at: "right bottom", @@ -109,7 +109,7 @@ jQuery(document).ready(function($) { beforeshow: function (e, dropdown) { // Задаем минимальную ширину меню var toggleWidth = dropdown.element.outerWidth(); - dropdown._target.css('width', toggleWidth > 200 ? toggleWidth : 'auto' ); + dropdown.getMenu().css('width', toggleWidth > 200 ? toggleWidth : 'auto' ); }, show: { effect: 'fadeIn' diff --git a/templates/skin/default/assets/js/nav.main.js b/templates/skin/default/assets/js/nav.main.js index 67c84a2..e1de22c 100644 --- a/templates/skin/default/assets/js/nav.main.js +++ b/templates/skin/default/assets/js/nav.main.js @@ -183,7 +183,7 @@ ls.plugin.admin.navMain = (function ($) { .appendTo(oBody); }); - $('.js-dropdown-nav-main').dropdown({ + $('.js-dropdown-nav-main').lsDropdown({ position: { my: "right-8 top-4", at: "left top", @@ -204,7 +204,7 @@ ls.plugin.admin.navMain = (function ($) { */ this.dropdownsDestroy = function () { $('.' + this.options.classes.dropdownMenu).remove(); - $('.js-dropdown-nav-main').dropdown('destroy'); + $('.js-dropdown-nav-main').lsDropdown('destroy'); }; /** diff --git a/templates/skin/default/layouts/layout.base.tpl b/templates/skin/default/layouts/layout.base.tpl index 2fca97a..a17cb0e 100644 --- a/templates/skin/default/layouts/layout.base.tpl +++ b/templates/skin/default/layouts/layout.base.tpl @@ -108,7 +108,7 @@
{$oUserCurrent->getLogin()}
-