Мелкие исправления

livestreet · Oct 9, 2014 · 6af51f0 · 6af51f0
1 parent 4154c95
commit 6af51f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -108,7 +108,7 @@
 					<div class="userbar-login">{$oUserCurrent->getLogin()}</div>
 				</div>
 
-				<ul class="dropdown-menu" id="dropdown-menu-userbar">
+				<ul class="nav nav--stacked nav--dropdown dropdown-menu" id="dropdown-menu-userbar">
 					<li>
 						<a href="{router page="admin/users/profile/{$oUserCurrent->getId()}"}">Мой профиль</a>	{* todo: add lang *}
 					</li>