Skip to content

Commit aa88170

Browse files
tickbhtickbh
committed
js format
1 parent 18ccff6 commit aa88170

41 files changed

Lines changed: 3899 additions & 4035 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app.js‎

Lines changed: 259 additions & 261 deletions
Large diffs are not rendered by default.

‎html/grid.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@
1111
<script type="text/javascript" src="app://js/jsgrid.min.js"></script>
1212
<link rel="stylesheet" type="text/css" href="app://js/jsgrid-theme.min.css" />
1313

14-
<link rel="stylesheet" type="text/css" href="demos.css" />
1514
<script src="app://js/util.js"></script>
1615
<script src="grid.js"></script>
1716

1817
</head>
1918

2019
<body style="height: 100%">
21-
<div>
22-
<button hidden="true" type="button" onclick="onSaveData()">保存</button>
23-
<label id="preView"></label>
24-
</div>
2520
<div id="jsGrid"></div>
26-
2721
<script>
2822
</script>
2923
</body>

‎index.html‎

Lines changed: 75 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,87 @@
11
<html>
2-
<head>
3-
<meta charset="utf-8">
4-
5-
<style>
6-
#mainDock {
7-
position: relative;
8-
}
9-
h2 {
10-
margin: auto;
11-
}
12-
h2 span {
13-
color: #090;
14-
}
15-
body {
16-
margin: 3px;
17-
}
18-
</style>
19-
<link rel="import" href="app://bower_components/polymer/polymer.html">
20-
<link rel="import" href="app://bower_components/iron-flex-layout/iron-flex-layout.html">
21-
<link rel="stylesheet" href="app://bower_components/fontawesome/css/font-awesome.min.css">
2+
3+
<head>
4+
<meta charset="utf-8">
5+
6+
<style>
7+
#mainDock {
8+
position: relative;
9+
}
2210

23-
<link rel="stylesheet" type="text/css" href="app://js/layout.css"/>
24-
25-
<link rel="stylesheet" type="text/css" href="app://node_modules/jQuery-contextMenu/src/jquery.contextMenu.css"/>
26-
<script src="app://node_modules/jquery/dist/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script>
27-
28-
<!--<script src="app://js/jquery.js" onload="window.$ = window.jQuery = module.exports;"></script>-->
29-
30-
<!--<script src="app://js/jquery-1.8.3.js" ></script>-->
31-
32-
<script src="app://node_modules/jquery-contextmenu/src/jquery.contextMenu.js"></script>
33-
<script src="app://node_modules/jquery-contextmenu/src/jquery.ui.position.js"></script>
34-
<script src="app://node_modules/FileSaver/FileSaver.js"></script>
35-
<script type="text/javascript" src="app://third/html5/cocos2d-js.js" charset="UTF-8"></script>
36-
37-
<link rel="stylesheet" type="text/css" href="app://js/jsgrid.min.css" />
38-
<script type="text/javascript" src="app://js/jsgrid.min.js"></script>
39-
<link rel="stylesheet" type="text/css" href="app://js/jsgrid-theme.min.css" />
40-
41-
<script src="app://js/util.js"></script>
42-
<script src="app://js/keycode.js"></script>
43-
<script src="app://js/renderUndo.js"></script>
44-
<script src="app://js/cocosUtil.js"></script>
45-
<script src="app://js/UIUtil.js"></script>
46-
<script src="app://js/fabric.js"></script>
11+
h2 {
12+
margin: auto;
13+
}
4714

48-
<script src="app://render/ipc.js"></script>
49-
<script src="app://render/console.js"></script>
15+
h2 span {
16+
color: #090;
17+
}
18+
19+
body {
20+
margin: 3px;
21+
}
22+
</style>
23+
<link rel="import" href="app://bower_components/polymer/polymer.html">
24+
<link rel="import" href="app://bower_components/iron-flex-layout/iron-flex-layout.html">
25+
<link rel="stylesheet" href="app://bower_components/fontawesome/css/font-awesome.min.css">
5026

51-
<link rel="import" href="app://ext/init.html">
52-
<link rel="import" href="app://prop/index.html">
27+
<link rel="stylesheet" type="text/css" href="app://js/layout.css" />
5328

54-
<link rel="import" href="app://packages/td-tree-view/widget/td-tree-view.html">
55-
<link rel="import" href="app://packages/td-tree-view/widget/td-tree-item.html">
29+
<link rel="stylesheet" type="text/css" href="app://node_modules/jQuery-contextMenu/src/jquery.contextMenu.css" />
30+
<script src="app://node_modules/jquery/dist/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script>
5631

57-
<link rel="import" href="app://packages/nodeorder/panel/nodeorder.html">
58-
<link rel="import" href="app://packages/resorder/panel/resorder.html">
59-
<link rel="import" href="app://packages/controlpanel/panel/controlpanel.html">
60-
<link rel="import" href="app://packages/console/panel/console.html">
61-
<link rel="import" href="app://packages/renderpanel/panel/renderpanel.html">
62-
<link rel="import" href="app://packages/proppanel/panel/proppanel.html">
32+
<!--<script src="app://js/jquery.js" onload="window.$ = window.jQuery = module.exports;"></script>-->
6333

64-
<!-- Core Modules -->
65-
<link rel="stylesheet" type="text/css" href="app://js/wcDocker.min.css"/>
66-
<script src="app://js/wcDocker.min.js"></script>
34+
<!--<script src="app://js/jquery-1.8.3.js" ></script>-->
6735

68-
<!-- Demo specific files -->
69-
<link rel='stylesheet' href='app://js/spectrum.css'/>
70-
<script src='app://js/spectrum.js'></script>
71-
<script src="app://layout.js"></script>
36+
<script src="app://node_modules/jquery-contextmenu/src/jquery.contextMenu.js"></script>
37+
<script src="app://node_modules/jquery-contextmenu/src/jquery.ui.position.js"></script>
38+
<script src="app://node_modules/FileSaver/FileSaver.js"></script>
39+
<script type="text/javascript" src="app://third/html5/cocos2d-js.js" charset="UTF-8"></script>
7240

73-
</head>
41+
<link rel="stylesheet" type="text/css" href="app://js/jsgrid.min.css" />
42+
<script type="text/javascript" src="app://js/jsgrid.min.js"></script>
43+
<link rel="stylesheet" type="text/css" href="app://js/jsgrid-theme.min.css" />
7444

75-
<body >
76-
77-
<div class="dockerContainer" style="position:absolute;left:0px;right:0px;top:0px;bottom:0px;border:3px solid black"></div>
78-
<script>
45+
<script src="app://js/util.js"></script>
46+
<script src="app://js/keycode.js"></script>
47+
<script src="app://js/renderUndo.js"></script>
48+
<script src="app://js/cocosUtil.js"></script>
49+
<script src="app://js/UIUtil.js"></script>
50+
<script src="app://js/fabric.js"></script>
51+
52+
<script src="app://render/ipc.js"></script>
53+
<script src="app://render/console.js"></script>
54+
55+
<link rel="import" href="app://ext/init.html">
56+
<link rel="import" href="app://prop/index.html">
57+
58+
<link rel="import" href="app://packages/td-tree-view/widget/td-tree-view.html">
59+
<link rel="import" href="app://packages/td-tree-view/widget/td-tree-item.html">
60+
61+
<link rel="import" href="app://packages/nodeorder/panel/nodeorder.html">
62+
<link rel="import" href="app://packages/resorder/panel/resorder.html">
63+
<link rel="import" href="app://packages/controlpanel/panel/controlpanel.html">
64+
<link rel="import" href="app://packages/console/panel/console.html">
65+
<link rel="import" href="app://packages/renderpanel/panel/renderpanel.html">
66+
<link rel="import" href="app://packages/proppanel/panel/proppanel.html">
67+
68+
<!-- Core Modules -->
69+
<link rel="stylesheet" type="text/css" href="app://js/wcDocker.min.css" />
70+
<script src="app://js/wcDocker.min.js"></script>
71+
72+
<!-- Demo specific files -->
73+
<link rel='stylesheet' href='app://js/spectrum.css' />
74+
<script src='app://js/spectrum.js'></script>
75+
<script src="app://layout.js"></script>
76+
77+
</head>
78+
79+
<body>
80+
81+
<div class="dockerContainer" style="position:absolute;left:0px;right:0px;top:0px;bottom:0px;border:3px solid black"></div>
82+
<script>
7983

8084
</script>
81-
</body>
82-
</html>
85+
</body>
86+
87+
</html>

‎js/cocosUtil.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ function cocosExportNodeData (node, ext) {
186186
}
187187
}
188188

189-
190189
return data
191190
}
192191

‎js/renderUndo.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class Command {
2727
NodePropChange(node, this.info.prop, this.info.oldValue)
2828
}
2929

30-
3130
return true
3231
}
3332
console.warn('Please implement undo function in your command')
@@ -170,18 +169,18 @@ class CommandGroup {
170169
class UndoList extends EventEmitter {
171170
constructor (type) {
172171
super()
173-
//是否变化时发送事件的变化
172+
// 是否变化时发送事件的变化
174173
this._silent = false
175-
//分为local和global类型, local类型事件变化只会通知本地, global则会通常整个编辑器
174+
// 分为local和global类型, local类型事件变化只会通知本地, global则会通常整个编辑器
176175
this._type = type
177176

178-
//当前的命令列表
177+
// 当前的命令列表
179178
this._curGroup = new CommandGroup()
180-
//操作过程的命令列表
179+
// 操作过程的命令列表
181180
this._groups = []
182-
//记录当前的位置信息
181+
// 记录当前的位置信息
183182
this._position = -1
184-
//上一次保存时的位置信息
183+
// 上一次保存时的位置信息
185184
this._savePosition = -1
186185
}
187186

0 commit comments

Comments
 (0)