Skip to content

Commit 4d79214

Browse files
committed
【fix】修改例子页面颜色配置逻辑 review by luoxiao
# Conflicts: # examples/js/theme/theme.js
1 parent cac9814 commit 4d79214

27 files changed

+31
-30
lines changed

examples/classic/editor-wechat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1111
<script
1212
type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,ace,i18n"
13+
include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1414
src="../js/include-web.js"
1515
></script>
1616
<link rel="stylesheet" href="../css/common.css" />

examples/classic/editor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title data-i18n="resources.title_editorClassic"></title>
99
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
11-
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n"
11+
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1212
src="../js/include-web.js"></script>
1313
<link rel="stylesheet" href="../css/common.css">
1414
<link rel="stylesheet" href="../css/header.css">

examples/classic/examples-wechat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

examples/classic/examples.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
1212
<script type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
13+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1414
src="../js/include-web.js"></script>
1515
<link rel="stylesheet" href="../css/common.css">
1616
<link rel="stylesheet" href="../css/header.css">

examples/component/editor-wechat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1111
<script
1212
type="text/javascript"
13-
include="jquery,bootstrap,template,admin-lte,ace,i18n"
13+
include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1414
src="../js/include-web.js"
1515
></script>
1616
<link rel="stylesheet" href="../css/common.css" />

examples/component/editor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title data-i18n="resources.title_editorComponent"></title>
99
<link rel="shortcut icon" type="image/x-icon" href="../img/favicon.ico"/>
1010
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
11-
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n"
11+
<script type="text/javascript" include="jquery,bootstrap,template,admin-lte,ace,i18n,theme"
1212
src="../js/include-web.js"></script>
1313
<link rel="stylesheet" href="../css/common.css">
1414
<link rel="stylesheet" href="../css/header.css">

examples/component/examples-wechat.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

examples/component/examples.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

examples/component/templates.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
1212
<script
1313
type="text/javascript"
14-
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload"
14+
include="jquery,bootstrap,template,admin-lte,jquery.scrollto,i18n,lazyload,theme"
1515
src="../js/include-web.js"
1616
></script>
1717
<link rel="stylesheet" href="../css/common.css" />

examples/js/include-web.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@
8282

8383
inputScript("../js/utils.js");
8484
inputScript("../js/localization.js");
85-
inputScript("../js/theme/themeConfig.js");
86-
inputScript("../js/theme/theme.js");
8785
document.writeln("<script>Localization.initializeI18N('../', function () {Localization.localize();Localization.initGlobal();}); </script>");
8886
jQueryInclude = true;
8987
}
88+
if (inArray(includes, 'theme')) {
89+
inputScript("../js/theme/themeConfig.js");
90+
inputScript("../js/theme/theme.js");
91+
}
9092
if (inArray(includes, 'jquery') && !jQueryInclude) {
9193
inputScript(libsurl + '/jquery/jquery.min.js');
9294
}

0 commit comments

Comments
 (0)