Skip to content

Commit 6a2db9d

Browse files
zhurczhurc
committed
调整站点主题颜色;在线编辑页默认收缩侧边栏;&其他细节 review by songyumeng
1 parent 618b517 commit 6a2db9d

File tree

21 files changed

+155
-305
lines changed

21 files changed

+155
-305
lines changed

‎examples/css/examples.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ h3.category-title {
2626
margin-top: 10px;
2727
height: 50px;
2828
line-height: 50px;
29-
border-bottom: 1px solid #cccccc;
29+
border-bottom: 1px solid #3c8dbc;
3030
}
3131

3232
.category-content {

‎examples/iclient3d/config.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ var exampleConfig = {
1919
}
2020
}
2121
};
22-
23-
var sideBarIconMap = {
22+
/**
23+
*key值：为exampleConfig配置的key值或者fileName值
24+
* （为中间节点时是key值，叶结点是fileName值）
25+
*value值：fontawesome字体icon名
26+
*不分层
27+
*/
28+
var sideBarIconConfig = {
2429
"iClient3D": "fa-globe"
2530
};

‎examples/iclient3d/editor.html‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
2222
<![endif]-->
2323
</head>
24-
<body class="hold-transition skin-blue sidebar-mini">
24+
<body class="hold-transition skin-blue sidebar-mini sidebar-collapse">
2525

2626
<div class="wrapper">
2727
<!--头部-->
@@ -80,36 +80,5 @@
8080
<script type="text/javascript" src="./config.js"></script>
8181
<script type="text/javascript" src="../js/sidebar.js"></script>
8282
<script type="text/javascript" src="../js/editor.js"></script>
83-
<script>
84-
85-
$(document).ready(function () {
86-
initPage();
87-
bindEvents();
88-
});
89-
function bindEvents() {
90-
$("#sidebar ul.third-menu a").click(function (evt) {
91-
var target = $(evt.target).parent().parent();
92-
var nodeId = evt.target.id;
93-
//如果点击的是span节点还要往上一层
94-
if (evt.target.localName === "span") {
95-
nodeId = target.attr('id');
96-
}
97-
if (nodeId) {
98-
evt.preventDefault();
99-
window.location.hash = "#" + nodeId;
100-
initEditor();
101-
evt.stopPropagation();
102-
}
103-
});
104-
window.addEventListener("hashchange", function () {
105-
var hash = window.location.hash;
106-
if (hash.indexOf("#") !== -1) {
107-
var id = hash.split("#")[1];
108-
selectMenu(id);
109-
}
110-
});
111-
}
112-
113-
</script>
11483
</body>
11584
</html>

‎examples/iclient3d/examples.html‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -75,41 +75,6 @@
7575
<script type="text/javascript" src="./config.js"></script>
7676
<script type="text/javascript" src="../js/sidebar.js"></script>
7777
<script type="text/javascript" src="../js/example.js"></script>
78-
<script>
79-
80-
$(document).ready(function () {
81-
initPage();
82-
bindEvents();
83-
84-
});
85-
function bindEvents() {
86-
$("ul#sidebar-menu>li").on('click', function (evt) {
87-
window.location.hash = "#" + evt.target.id;
88-
});
89-
90-
$("ul#sidebar-menu ul.second-menu a").on('click', function (evt) {
91-
var target = $(evt.target).parent().parent();
92-
var nodeId = evt.target.id;
93-
//如果点击的是span节点还要往上一层
94-
if (evt.target.localName === "span") {
95-
nodeId = target.attr('id');
96-
target = target.parent().parent();
97-
}
98-
var prefixId = target.attr('id');
99-
if (nodeId) {
100-
evt.preventDefault();
101-
var id = prefixId + "-" + nodeId;
102-
window.location.hash = "#" + id;
103-
evt.stopPropagation();
104-
}
105-
});
106-
window.addEventListener("hashchange", function () {
107-
scroll();
108-
});
109-
}
110-
111-
112-
</script>
11378

11479
</body>
11580
</html>

‎examples/js/editor.js‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
$(document).ready(function () {
2+
initPage();
3+
bindEvents();
4+
});
5+
16
var aceEditor;
27
var myWidth = 0, myHeight = 0;
38
var containExamples = true;
@@ -11,7 +16,7 @@ function initPage() {
1116
initSelect();
1217
initEditor();
1318
screenResize();
14-
dragCode();
19+
// dragCode();
1520
}
1621

1722
function screenResize() {
@@ -157,7 +162,31 @@ function initSelect() {
157162
}
158163

159164
function mapHeight() {
160-
$("#innerPage").contents().find("html").height("100%");
161-
$("#innerPage").contents().find("body").height("100%");
165+
var doc = $("#innerPage").contents();
166+
doc.find("html").height("100%");
167+
doc.find("body").height("100%");
162168
}
163169

170+
function bindEvents() {
171+
$("#sidebar ul.third-menu a").click(function (evt) {
172+
var target = $(evt.target).parent().parent();
173+
var nodeId = evt.target.id;
174+
//如果点击的是span节点还要往上一层
175+
if (evt.target.localName === "span") {
176+
nodeId = target.attr('id');
177+
}
178+
if (nodeId) {
179+
evt.preventDefault();
180+
window.location.hash = "#" + nodeId;
181+
initEditor();
182+
evt.stopPropagation();
183+
}
184+
});
185+
window.addEventListener("hashchange", function () {
186+
var hash = window.location.hash;
187+
if (hash.indexOf("#") !== -1) {
188+
var id = hash.split("#")[1];
189+
selectMenu(id);
190+
}
191+
});
192+
}

‎examples/js/example.js‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
$(document).ready(function () {
2+
initPage();
3+
bindEvents();
4+
});
15
var exConfig = exampleConfig,
26
containExamples = false,
37
thumbLocation = getThumbLocation();
@@ -40,10 +44,6 @@ function createGalleryItem(id, config) {
4044
return categoryLi;
4145
}
4246

43-
function createGalleryItemTitle(id, title) {
44-
return $("<h3 class='category-title' id='" + id + "'>" + title + "</h3>");
45-
}
46-
4747
function createSubGalleryItem(config) {
4848
var categoryContentDiv = $("<div class='category-content'></div>");
4949
for (var key in config) {
@@ -58,6 +58,10 @@ function createSubGalleryItem(config) {
5858
return categoryContentDiv;
5959
}
6060

61+
function createGalleryItemTitle(id, title) {
62+
return $("<h3 class='category-title' id='" + id + "'>" + title + "</h3>");
63+
}
64+
6165
function createSubGalleryItemTitle(id, title) {
6266
return $("<h4 class='category-type' id='category-type-" + id + "'>" + title + "</h4>");
6367
}
@@ -124,4 +128,31 @@ function scroll() {
124128
$('body').scrollTo(ele, 500, {offset: -60});
125129
}
126130

127-
}
131+
}
132+
133+
function bindEvents() {
134+
$("ul#sidebar-menu>li").on('click', function (evt) {
135+
window.location.hash = "#" + evt.target.id;
136+
});
137+
138+
$("ul#sidebar-menu ul.second-menu a").on('click', function (evt) {
139+
var target = $(evt.target).parent().parent();
140+
var nodeId = evt.target.id;
141+
//如果点击的是span节点还要往上一层
142+
if (evt.target.localName === "span") {
143+
nodeId = target.attr('id');
144+
target = target.parent().parent();
145+
}
146+
var prefixId = target.attr('id');
147+
if (nodeId) {
148+
evt.preventDefault();
149+
var id = prefixId + "-" + nodeId;
150+
window.location.hash = "#" + id;
151+
evt.stopPropagation();
152+
}
153+
});
154+
window.addEventListener("hashchange", function () {
155+
scroll();
156+
});
157+
}
158+

‎examples/js/sidebar.js‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//左侧层级是否包含示例
22
var containExample = false;
3-
var sideBarIconMap = sideBarIconMap || {};
3+
var sideBarIconConfig = sideBarIconConfig || {};
44

55
function initSideBar() {
66
var sideBar = $("ul#sidebar-menu");
@@ -16,7 +16,7 @@ function createSideBarMenuItem(id, config, containAll) {
1616
}
1717
containExample = containAll;
1818
var li = $("<li id='" + id + "' class='treeview'></li>");
19-
var menuItemIcon = sideBarIconMap[id];
19+
var menuItemIcon = sideBarIconConfig[id];
2020
if (config.content) {
2121
createSideBarMenuTitle(id, config.name, true, menuItemIcon).appendTo(li);
2222
createSideBarSecondMenu(config.content).appendTo(li);
@@ -35,10 +35,10 @@ function createSideBarSecondMenu(config) {
3535
var configItem = config[key];
3636

3737
if (containExample && configItem.content) {
38-
createSideBarMenuTitle(key, configItem.name, true).appendTo(li);
38+
createSideBarFirstLevelTitle(key, configItem.name, true).appendTo(li);
3939
createSideBarThirdMenu(configItem.content).appendTo(li);
4040
} else {
41-
createSideBarMenuTitle(key, configItem.name, false).appendTo(li);
41+
createSideBarSecondLevelTitle(key, configItem.name, false).appendTo(li);
4242
}
4343
}
4444
return ul;
@@ -54,14 +54,23 @@ function createSideBarThirdMenu(examples) {
5454
var li = $("<li class='menuTitle' id='" + example.fileName + "' ></li>");
5555
li.appendTo(ul);
5656
if (example.fileName && example.name) {
57-
createSideBarMenuTitle(example.fileName, example.name, false, "").appendTo(li);
57+
createSideBarSecondLevelTitle(example.fileName, example.name, false).appendTo(li);
5858
}
5959
}
6060
return ul;
6161
}
6262

63+
function createSideBarFirstLevelTitle(id, title, collapse, iconName) {
64+
iconName = iconName || "fa-circle-o";
65+
return createSideBarMenuTitle(id, title, collapse, iconName)
66+
}
67+
68+
function createSideBarSecondLevelTitle(id, title, collapse, iconName) {
69+
iconName = iconName || " fa-genderless";
70+
return createSideBarMenuTitle(id, title, collapse, iconName)
71+
}
72+
6373
function createSideBarMenuTitle(id, title, collapse, iconName) {
64-
iconName = iconName || "fa-minus-square-o";
6574
id = id || "";
6675
var div = $("<a href='#' id='" + id + "'><i class='fa " + iconName + "'></i><span>" + title + "</span></a>");
6776
if (collapse) {
@@ -78,7 +87,9 @@ function createCollapsedIcon() {
7887
//只处理三层节点,后续可优化
7988
function selectMenu(id) {
8089
$("section#sidebar ul.menu-open").removeClass("menu-open");
90+
$("section#sidebar li.active").removeClass("active");
8191
var target = $("section#sidebar li#" + id);
92+
target.addClass('active');
8293
selectTarget(target.parent().parent().parent());
8394
selectTarget(target.parent());
8495
selectTarget(target.find("ul"));
@@ -94,3 +105,16 @@ function selectMenu(id) {
94105
}
95106
}
96107

108+
function collapseSideBar(rootElement, fold) {
109+
if (!rootElement) {
110+
return;
111+
}
112+
var collapseClassName = "sidebar-collapse";
113+
rootElement.removeClass(collapseClassName);
114+
if (fold) {
115+
rootElement.addClass(collapseClassName)
116+
} else {
117+
rootElement.removeClass(collapseClassName);
118+
}
119+
}
120+

‎examples/leaflet/config.js‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ var exampleConfig = {
416416
name: "天地图-墨卡托",
417417
thumbnail: "l_tiandituLayer_mercator.png",
418418
fileName: "tiandituLayer_mercator"
419-
},{
419+
}, {
420420
name: "天地图-经纬度",
421421
thumbnail: "l_tiandituLayer_ll.png",
422422
fileName: "tiandituLayer_ll"
@@ -434,13 +434,19 @@ var exampleConfig = {
434434
}
435435

436436
};
437-
var sideBarIconMap={
438-
"iServer":"fa-server",
439-
"iPortal":"fa-desktop",
440-
"online":"fa-cloud",
441-
"iManager":"fa-group",
442-
"plot":"fa-edit",
443-
"viz":"fa-map",
444-
"OGC":"fa-globe",
445-
"mapping":"fa-send"
437+
/**
438+
*key值：为exampleConfig配置的key值或者fileName值
439+
* （为中间节点时是key值，叶结点是fileName值）
440+
*value值：fontawesome字体icon名
441+
*不分层
442+
*/
443+
var sideBarIconConfig = {
444+
"iServer": "fa-server",
445+
"iPortal": "fa-desktop",
446+
"online": "fa-cloud",
447+
"iManager": "fa-group",
448+
"plot": "fa-edit",
449+
"viz": "fa-map",
450+
"OGC": "fa-globe",
451+
"mapping": "fa-send"
446452
};

0 commit comments

Comments
 (0)