diff --git a/src/core/BaseModel.coffee b/src/core/BaseModel.coffee index 9bce597..8cd4a9e 100644 --- a/src/core/BaseModel.coffee +++ b/src/core/BaseModel.coffee @@ -86,10 +86,8 @@ class BaseModel @dialog.title = data.title if data and data.title @dialog.init() - ask: (t, m, f) -> - @._gui.openDialog "YesNoDialog", (d) -> - f() if d - , t, { text: m } + ask: (data) -> + @._gui.openDialog("YesNoDialog", data) publish: (t, m, e) -> mt = @meta() diff --git a/src/core/handles/RemoteHandle.coffee b/src/core/handles/RemoteHandle.coffee index 48aef25..05ecec9 100644 --- a/src/core/handles/RemoteHandle.coffee +++ b/src/core/handles/RemoteHandle.coffee @@ -73,10 +73,13 @@ Ant.OS.API.handle = apigateway: (d, ws) -> if ws new Promise (resolve, reject) -> - path = "#{Ant.OS.API.HOST}/system/apigateway?ws=1" - proto = if window.location.protocol is "https:" then "wss://" else "ws://" - socket = new WebSocket proto + path - resolve(socket) + try + path = "#{Ant.OS.API.HOST}/system/apigateway?ws=1" + proto = if window.location.protocol is "https:" then "wss://" else "ws://" + socket = new WebSocket proto + path + resolve(socket) + catch e + reject e else path = "#{Ant.OS.API.REST}/system/apigateway?ws=0" Ant.OS.API.post path, d diff --git a/src/core/tags/ResizerTag.coffee b/src/core/tags/ResizerTag.coffee index 715406b..f700b80 100644 --- a/src/core/tags/ResizerTag.coffee +++ b/src/core/tags/ResizerTag.coffee @@ -52,7 +52,7 @@ class ResizerTag extends Ant.OS.GUI.BaseTag w = Math.round(e.clientX - offset.left) w = @minsize if w < @minsize $(@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) -> @@ -61,7 +61,7 @@ class ResizerTag extends Ant.OS.GUI.BaseTag h = Math.round(e.clientY - offset.top) h = @minsize if h < @minsize $(@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: () -> [] diff --git a/src/packages/CodePad/coffees/main.coffee b/src/packages/CodePad/coffees/main.coffee index 37a0fdc..eddb04c 100644 --- a/src/packages/CodePad/coffees/main.coffee +++ b/src/packages/CodePad/coffees/main.coffee @@ -42,7 +42,8 @@ class CodePad extends this.OS.GUI.BaseApplication highlightSelectedWord: true, behavioursEnabled: true, wrap: true, - fontSize: "11pt" + fontSize: "11pt", + showInvisibles: true } #themes = ace.require "ace/ext/themelist" @editor.setTheme "ace/theme/monokai" diff --git a/src/themes/antos_dark/afx-slider.css b/src/themes/antos_dark/afx-slider.css index eb26e76..e8278b8 100644 --- a/src/themes/antos_dark/afx-slider.css +++ b/src/themes/antos_dark/afx-slider.css @@ -11,9 +11,9 @@ afx-slider div.progress { } afx-slider div.dragpoint { - width: 20px; - height: 20px; + width: 15px; + height: 15px; border:1px solid #262626; - border-radius: 20px; + border-radius: 15px; background-color:#868686; } diff --git a/src/themes/antos_light/afx-slider.css b/src/themes/antos_light/afx-slider.css index 5d2c477..1e9d90b 100644 --- a/src/themes/antos_light/afx-slider.css +++ b/src/themes/antos_light/afx-slider.css @@ -11,9 +11,9 @@ afx-slider div.progress { } afx-slider div.dragpoint { - width: 20px; - height: 20px; + width: 15px; + height: 15px; border:1px solid #6b6b6b; - border-radius: 20px; + border-radius: 15px; background-color:#e6e6e6; } diff --git a/src/themes/system/fonts/hermit-light-webfont.woff b/src/themes/system/fonts/hermit-light-webfont.woff new file mode 100644 index 0000000..ac14771 Binary files /dev/null and b/src/themes/system/fonts/hermit-light-webfont.woff differ diff --git a/src/themes/system/fonts/hermit-light-webfont.woff2 b/src/themes/system/fonts/hermit-light-webfont.woff2 new file mode 100644 index 0000000..51420c4 Binary files /dev/null and b/src/themes/system/fonts/hermit-light-webfont.woff2 differ diff --git a/src/themes/system/hermit-light.css b/src/themes/system/hermit-light.css new file mode 100644 index 0000000..eafb5da --- /dev/null +++ b/src/themes/system/hermit-light.css @@ -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; + +} \ No newline at end of file