mirror of
https://github.com/lxsang/antos-frontend.git
synced 2024-12-27 17:58:22 +01:00
minor fix bug
This commit is contained in:
parent
61a0196c79
commit
5c08a189cc
@ -86,10 +86,8 @@ class BaseModel
|
|||||||
@dialog.title = data.title if data and data.title
|
@dialog.title = data.title if data and data.title
|
||||||
@dialog.init()
|
@dialog.init()
|
||||||
|
|
||||||
ask: (t, m, f) ->
|
ask: (data) ->
|
||||||
@._gui.openDialog "YesNoDialog", (d) ->
|
@._gui.openDialog("YesNoDialog", data)
|
||||||
f() if d
|
|
||||||
, t, { text: m }
|
|
||||||
|
|
||||||
publish: (t, m, e) ->
|
publish: (t, m, e) ->
|
||||||
mt = @meta()
|
mt = @meta()
|
||||||
|
@ -73,10 +73,13 @@ Ant.OS.API.handle =
|
|||||||
apigateway: (d, ws) ->
|
apigateway: (d, ws) ->
|
||||||
if ws
|
if ws
|
||||||
new Promise (resolve, reject) ->
|
new Promise (resolve, reject) ->
|
||||||
|
try
|
||||||
path = "#{Ant.OS.API.HOST}/system/apigateway?ws=1"
|
path = "#{Ant.OS.API.HOST}/system/apigateway?ws=1"
|
||||||
proto = if window.location.protocol is "https:" then "wss://" else "ws://"
|
proto = if window.location.protocol is "https:" then "wss://" else "ws://"
|
||||||
socket = new WebSocket proto + path
|
socket = new WebSocket proto + path
|
||||||
resolve(socket)
|
resolve(socket)
|
||||||
|
catch e
|
||||||
|
reject e
|
||||||
else
|
else
|
||||||
path = "#{Ant.OS.API.REST}/system/apigateway?ws=0"
|
path = "#{Ant.OS.API.REST}/system/apigateway?ws=0"
|
||||||
Ant.OS.API.post path, d
|
Ant.OS.API.post path, d
|
||||||
|
@ -52,7 +52,7 @@ class ResizerTag extends Ant.OS.GUI.BaseTag
|
|||||||
w = Math.round(e.clientX - offset.left)
|
w = Math.round(e.clientX - offset.left)
|
||||||
w = @minsize if w < @minsize
|
w = @minsize if w < @minsize
|
||||||
$(@resizable_el).attr "data-width", w.toString()
|
$(@resizable_el).attr "data-width", w.toString()
|
||||||
@observable.trigger "resize", { id: @resizable_el.aid(), data: w }
|
@observable.trigger "resize", { id: @aid(), data: { w: w } }
|
||||||
|
|
||||||
|
|
||||||
verticalResize: (e) ->
|
verticalResize: (e) ->
|
||||||
@ -61,7 +61,7 @@ class ResizerTag extends Ant.OS.GUI.BaseTag
|
|||||||
h = Math.round(e.clientY - offset.top)
|
h = Math.round(e.clientY - offset.top)
|
||||||
h = @minsize if h < @minsize
|
h = @minsize if h < @minsize
|
||||||
$(@resizable_el).attr "data-height", h.toString()
|
$(@resizable_el).attr "data-height", h.toString()
|
||||||
@observable.trigger "resize", { id: @resizable_el.aid(), data: h }
|
@observable.trigger "resize", { id: @aid(), data: { w: w } }
|
||||||
|
|
||||||
layout: () ->
|
layout: () ->
|
||||||
[]
|
[]
|
||||||
|
@ -42,7 +42,8 @@ class CodePad extends this.OS.GUI.BaseApplication
|
|||||||
highlightSelectedWord: true,
|
highlightSelectedWord: true,
|
||||||
behavioursEnabled: true,
|
behavioursEnabled: true,
|
||||||
wrap: true,
|
wrap: true,
|
||||||
fontSize: "11pt"
|
fontSize: "11pt",
|
||||||
|
showInvisibles: true
|
||||||
}
|
}
|
||||||
#themes = ace.require "ace/ext/themelist"
|
#themes = ace.require "ace/ext/themelist"
|
||||||
@editor.setTheme "ace/theme/monokai"
|
@editor.setTheme "ace/theme/monokai"
|
||||||
|
@ -11,9 +11,9 @@ afx-slider div.progress {
|
|||||||
}
|
}
|
||||||
|
|
||||||
afx-slider div.dragpoint {
|
afx-slider div.dragpoint {
|
||||||
width: 20px;
|
width: 15px;
|
||||||
height: 20px;
|
height: 15px;
|
||||||
border:1px solid #262626;
|
border:1px solid #262626;
|
||||||
border-radius: 20px;
|
border-radius: 15px;
|
||||||
background-color:#868686;
|
background-color:#868686;
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,9 @@ afx-slider div.progress {
|
|||||||
}
|
}
|
||||||
|
|
||||||
afx-slider div.dragpoint {
|
afx-slider div.dragpoint {
|
||||||
width: 20px;
|
width: 15px;
|
||||||
height: 20px;
|
height: 15px;
|
||||||
border:1px solid #6b6b6b;
|
border:1px solid #6b6b6b;
|
||||||
border-radius: 20px;
|
border-radius: 15px;
|
||||||
background-color:#e6e6e6;
|
background-color:#e6e6e6;
|
||||||
}
|
}
|
||||||
|
BIN
src/themes/system/fonts/hermit-light-webfont.woff
Normal file
BIN
src/themes/system/fonts/hermit-light-webfont.woff
Normal file
Binary file not shown.
BIN
src/themes/system/fonts/hermit-light-webfont.woff2
Normal file
BIN
src/themes/system/fonts/hermit-light-webfont.woff2
Normal file
Binary file not shown.
12
src/themes/system/hermit-light.css
Normal file
12
src/themes/system/hermit-light.css
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
/*! Generated by Font Squirrel (https://www.fontsquirrel.com) on August 6, 2017 */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: 'HermitLight';
|
||||||
|
src: url('fonts/hermit-light-webfont.woff2') format('woff2'),
|
||||||
|
url('fonts/hermit-light-webfont.woff') format('woff');
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user