lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#18892: Fixing shape tracing hierarchies

Browse Source 
Some deep items where not expandable due to a bad jQuery selector

Work Item: 18892

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-27 16:13:36 -07:00
parent c922b192a5
commit 50003b1cb7
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
View File

@@ -190,8 +190,11 @@ jQuery(function ($) {
shapeTracingWindowTree.append(shapes);
// remove empty list items
shapeTracingWindowTree.find('ul:empty').remove();
// add the expand/collapse logic to the shapes tree
shapeTracingWindowTree.find('li:has(ul:has(li))').prepend($(glyph));
shapeTracingWindowTree.find('li:has(ul)').prepend($(glyph));
// collapse all sub uls
shapeTracingWindowTree.find('ul ul').toggle(false);
@@ -321,8 +324,11 @@ jQuery(function ($) {
// move all shape tracing meta blocks to the content window
$("[shape-id-meta]").detach().prependTo(shapeTracingWindowContent);
// remove empty list items
shapeTracingWindowContent.find('ul:empty').remove();
// add the expand/collapse logic to the shape model
shapeTracingWindowContent.find('li:has(ul:has(li))').prepend($(glyph));
shapeTracingWindowContent.find('ul:has(ul)').prepend($(glyph));
// collapse all sub uls
shapeTracingWindowContent.find('ul ul').toggle(false);
@@ -343,8 +349,11 @@ jQuery(function ($) {
shapeTracingBreadcrumb.text('');
// remove empty list items
shapeTracingMetaContent.find('ul:empty').remove();
// create collapsible containers
shapeTracingMetaContent.find('li:has(ul:has(li))').prepend($(glyph));
shapeTracingMetaContent.find('li:has(ul)').prepend($(glyph));
shapeTracingMetaContent.find('ul ul').toggle(false);
shapeTracingMetaContent.find('.expando-glyph-container').click(expandCollapseExpando);
@@ -377,8 +386,11 @@ jQuery(function ($) {
shapeTracingBreadcrumb.text('');
// remove empty list items
shapeTracingMetaContent.find('ul:empty').remove();
// create collapsible containers
shapeTracingMetaContent.find('li:has(ul:has(li))').prepend($(glyph));
shapeTracingMetaContent.find('li:has(ul)').prepend($(glyph));
shapeTracingMetaContent.find('ul ul').toggle(false);
shapeTracingMetaContent.find('.expando-glyph-container').click(expandCollapseExpando);

10
src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingWrapper.cshtml
View File

@@ -1,11 +1,5 @@
@using Orchard;
@using Orchard.DisplayManagement.Descriptors;
@using Orchard.DesignerTools.Services;
@using System.Xml;
@{
Script.Require("jQueryUI_Tabs").AtHead();
Script.Require("jQueryUI_Resizable").AtHead();
@{
Script.Require("jQueryUI").AtHead();
Script.Include("orchard-designertools-shapetracing.js").AtHead();
Script.Include("jquery.scrollTo-min.js").AtHead();
Style.Include("orchard-designertools-shapetracing.css");