Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
4a58b579
T
three.js
项目概览
Ablesons
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4a58b579
编写于
8月 28, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Tried to use CodeMirror for editing userData and found out it can't be resized.
上级
4f6d3e99
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
31 deletion
+30
-31
editor/css/main.css
editor/css/main.css
+11
-15
editor/js/Sidebar.Object3D.js
editor/js/Sidebar.Object3D.js
+7
-4
editor/js/Sidebar.Script.js
editor/js/Sidebar.Script.js
+7
-7
editor/js/libs/ui.editor.js
editor/js/libs/ui.editor.js
+5
-5
未找到文件。
editor/css/main.css
浏览文件 @
4a58b579
...
...
@@ -23,6 +23,17 @@ textarea {
word-wrap
:
normal
;
}
textarea
.success
{
border-color
:
#8b8
!important
;
}
textarea
.fail
{
border-color
:
#f00
!important
;
background-color
:
rgba
(
255
,
0
,
0
,
0.05
);
}
textarea
,
input
{
outline
:
none
;
}
/* osx */
.Panel
{
-moz-user-select
:
none
;
-webkit-user-select
:
none
;
...
...
@@ -55,21 +66,6 @@ textarea {
display
:
none
;
}
/* codemirror */
.CodeMirror
{
border
:
1px
solid
#ccc
;
}
.CodeMirror.success
{
border-color
:
#8b8
;
}
.CodeMirror.fail
{
border-color
:
#f00
;
background-color
:
rgba
(
255
,
0
,
0
,
0.05
);
}
/* scene types */
.type
{
...
...
editor/js/Sidebar.Object3D.js
浏览文件 @
4a58b579
...
...
@@ -196,6 +196,8 @@ Sidebar.Object3D = function ( editor ) {
container
.
add
(
objectVisibleRow
);
// user data
var
timeout
;
var
objectUserDataRow
=
new
UI
.
Panel
();
var
objectUserData
=
new
UI
.
TextArea
().
setWidth
(
'
150px
'
).
setHeight
(
'
40px
'
).
setColor
(
'
#444
'
).
setFontSize
(
'
12px
'
).
onChange
(
update
);
...
...
@@ -204,13 +206,14 @@ Sidebar.Object3D = function ( editor ) {
try
{
JSON
.
parse
(
objectUserData
.
getValue
()
);
objectUserData
.
setBorderColor
(
'
#ccc
'
);
objectUserData
.
setBackgroundColor
(
''
);
objectUserData
.
dom
.
classList
.
add
(
'
success
'
);
objectUserData
.
dom
.
classList
.
remove
(
'
fail
'
);
}
catch
(
error
)
{
objectUserData
.
setBorderColor
(
'
#f00
'
);
objectUserData
.
setBackgroundColor
(
'
rgba(255,0,0,0.25)
'
);
objectUserData
.
dom
.
classList
.
remove
(
'
success
'
);
objectUserData
.
dom
.
classList
.
add
(
'
fail
'
);
}
...
...
editor/js/Sidebar.Script.js
浏览文件 @
4a58b579
...
...
@@ -22,8 +22,8 @@ Sidebar.Script = function ( editor ) {
var
timeout
;
var
scriptSourceRow
=
new
UI
.
Panel
();
var
scriptSource
=
new
UI
.
CodeEditor
(
'
javascript
'
).
setWidth
(
'
240px
'
).
setHeight
(
'
180px
'
).
setFontSize
(
'
12px
'
);
scriptSource
.
on
Change
(
function
()
{
var
scriptSource
=
new
UI
.
TextArea
(
'
javascript
'
).
setWidth
(
'
240px
'
).
setHeight
(
'
180px
'
).
setFontSize
(
'
12px
'
);
scriptSource
.
on
KeyUp
(
function
()
{
clearTimeout
(
timeout
);
...
...
@@ -37,13 +37,13 @@ Sidebar.Script = function ( editor ) {
var
script
=
new
Function
(
'
scene
'
,
'
time
'
,
source
).
bind
(
object
.
clone
()
);
script
(
new
THREE
.
Scene
(),
0
);
scriptSource
.
editor
.
display
.
wrapper
.
classList
.
add
(
'
success
'
);
scriptSource
.
editor
.
display
.
wrapper
.
classList
.
remove
(
'
fail
'
);
scriptSource
.
dom
.
classList
.
add
(
'
success
'
);
scriptSource
.
dom
.
classList
.
remove
(
'
fail
'
);
}
catch
(
error
)
{
scriptSource
.
editor
.
display
.
wrapper
.
classList
.
remove
(
'
success
'
);
scriptSource
.
editor
.
display
.
wrapper
.
classList
.
add
(
'
fail
'
);
scriptSource
.
dom
.
classList
.
remove
(
'
success
'
);
scriptSource
.
dom
.
classList
.
add
(
'
fail
'
);
return
;
...
...
@@ -53,7 +53,7 @@ Sidebar.Script = function ( editor ) {
editor
.
signals
.
objectChanged
.
dispatch
(
object
);
},
3
00
);
},
5
00
);
}
);
...
...
editor/js/libs/ui.editor.js
浏览文件 @
4a58b579
...
...
@@ -10,11 +10,11 @@ UI.CodeEditor = function ( mode ) {
dom
.
className
=
'
CodeEditor
'
;
var
editor
=
CodeMirror
(
dom
,
{
mode
:
mode
,
indentWithTabs
:
true
,
lineWrapping
:
true
,
matchBrackets
:
true
}
);
editor
.
on
(
'
change
'
,
function
()
{
editor
.
on
KeyUp
(
'
keyup
'
,
function
()
{
if
(
scope
.
on
Change
Callback
!==
undefined
)
{
if
(
scope
.
on
KeyUp
Callback
!==
undefined
)
{
scope
.
on
Change
Callback
();
scope
.
on
KeyUp
Callback
();
}
...
...
@@ -63,9 +63,9 @@ UI.CodeEditor.prototype.setValue = function ( value ) {
};
UI
.
CodeEditor
.
prototype
.
on
Change
=
function
(
callback
)
{
UI
.
CodeEditor
.
prototype
.
on
KeyUp
=
function
(
callback
)
{
this
.
on
Change
Callback
=
callback
;
this
.
on
KeyUp
Callback
=
callback
;
return
this
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录