Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gargantext-ihaskell
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
gargantext-ihaskell
Commits
cfc38215
Commit
cfc38215
authored
Jul 01, 2021
by
David Davó
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some updates to 5.0
parent
3dd254a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
9 deletions
+3
-9
Common.hs
...y/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs
+0
-1
Singletons.hs
...askell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
+0
-1
Types.hs
...ay/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs
+1
-6
Types.hs
ipython-kernel/src/IHaskell/IPython/Types.hs
+2
-1
No files found.
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs
View file @
cfc38215
...
...
@@ -31,7 +31,6 @@ pattern ViewName = S.SViewName
pattern
ModelModule
=
S
.
SModelModule
pattern
ModelModuleVersion
=
S
.
SModelModuleVersion
pattern
ModelName
=
S
.
SModelName
pattern
MsgThrottle
=
S
.
SMsgThrottle
pattern
DisplayHandler
=
S
.
SDisplayHandler
pattern
Visible
=
S
.
SVisible
pattern
CSS
=
S
.
SCSS
...
...
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
View file @
cfc38215
...
...
@@ -35,7 +35,6 @@ singletons
| ModelModule
| ModelModuleVersion
| ModelName
| MsgThrottle
| DisplayHandler
| Visible
| CSS
...
...
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs
View file @
cfc38215
...
...
@@ -119,7 +119,7 @@ type (a :++ b) = a ++ b
-- Classes from IPython's widget hierarchy. Defined as such to reduce code duplication.
type
WidgetClass
=
[
'S
.
ViewModule
,
'S
.
ViewModuleVersion
,
'S
.
ViewName
,
'S
.
ModelModule
,
'S
.
ModelModuleVersion
,
'S
.
ModelName
,
'S
.
MsgThrottle
,
'S
.
DisplayHandler
]
'S
.
ModelModule
,
'S
.
ModelModuleVersion
,
'S
.
ModelName
,
'S
.
DisplayHandler
]
type
DOMWidgetClass
=
WidgetClass
:++
[
'S
.
Visible
,
'S
.
CSS
,
'S
.
DOMClasses
,
'S
.
Width
,
'S
.
Height
,
'S
.
Padding
,
'S
.
Margin
,
'S
.
Color
,
'S
.
BackgroundColor
,
'S
.
BorderColor
,
'S
.
BorderWidth
,
...
...
@@ -165,7 +165,6 @@ type family FieldType (f :: Field) :: * where
FieldType
'S
.
ModelModule
=
Text
FieldType
'S
.
ModelModuleVersion
=
Text
FieldType
'S
.
ModelName
=
Text
FieldType
'S
.
MsgThrottle
=
Integer
FieldType
'S
.
DisplayHandler
=
IO
()
FieldType
'S
.
Visible
=
Bool
FieldType
'S
.
CSS
=
[(
Text
,
Text
,
Text
)]
...
...
@@ -395,9 +394,6 @@ instance ToPairs (Attr 'S.ModelModuleVersion) where
instance
ToPairs
(
Attr
'S
.
ModelName
)
where
toPairs
x
=
[
"_model_name"
.=
toJSON
x
]
instance
ToPairs
(
Attr
'S
.
MsgThrottle
)
where
toPairs
x
=
[
"msg_throttle"
.=
toJSON
x
]
instance
ToPairs
(
Attr
'S
.
DisplayHandler
)
where
toPairs
_
=
[]
-- Not sent to the frontend
...
...
@@ -657,7 +653,6 @@ defaultControlWidget viewName modelName = (ViewModule =:: "@jupyter-widgets/cont
:&
(
ModelModule
=::
"@jupyter-widgets/controls"
)
:&
(
ModelModuleVersion
=::
"1.4.0"
)
:&
(
ModelName
=::
modelName
)
:&
(
MsgThrottle
=:+
3
)
:&
(
DisplayHandler
=::
return
()
)
:&
RNil
...
...
ipython-kernel/src/IHaskell/IPython/Types.hs
View file @
cfc38215
...
...
@@ -580,7 +580,8 @@ instance ToJSON Message where
toJSON
PublishStatus
{
executionState
=
executionState
}
=
object
[
"execution_state"
.=
executionState
]
toJSON
PublishStream
{
streamType
=
streamType
,
streamContent
=
content
}
=
object
[
"data"
.=
content
,
"name"
.=
streamType
]
-- Since 5.0 "data" key was renamed to "text"
object
[
"text"
.=
content
,
"name"
.=
streamType
,
"output_type"
.=
string
"stream"
]
toJSON
r
@
PublishDisplayData
{
displayData
=
datas
}
=
object
$
case
transient
r
of
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment