+
-
be Tool
New Entry
Sync it
Add Comment
12.03.2012 15:12:54
Publish
Add text field
Add media field
^
^
Border
Fill
Alpha
Width
Radius
^
^
Color
Fill
Alpha
press
Choose database:
Go sync it
Your version in your workspace
Update changes\n\nThis example shows an automatic update that does not solve conflicts. You have three versions of a part below, your version is on the right and the version on the bottom is the updated version in PartsBin.\nAs you see, the Color and size of the rectangle was updated, whilst your version updated the position of the Rectangle.\nExpected behavior: the color and size should update in the workspace version, too.However, as both PartsBin and workspace version changed the color of the Ellipse, this should not update, as it is a conflict.
$morph('Ellipse').update($morph('Ellipse').newThreeWayDiff($morph('Sibling'),$morph('Parent')))
parent version
new version in PartsBin
Label
Value
Label
HyperCard
X
M
–
Up
Down
Remove Card
Add new Card
Rename Card
Enter Background Mode
<
![](\"http://lively-kernel.org/repository/webwerkstatt/media/hpi_logo.png\"){kind=logo}
undefined
First Name
undefined
Last Name
undefined
Email
undefined
Institute
next >
< previous
Astrid
First Name
Thomschke
Last Name
astrid@me.org
Email
HPI
Institute
[[Astrid, Thomschke], [Hubert, Hesse]]\nFrom the institutes: [[HPI] [BitBet]]
refresh
Hubert
First Name
Hesse
Last Name
hubert@me.org
Email
BitBet
Institute
Layout
adjustForNewBounds
resizeWidth
resizeHeight
moveVertical
centeredVertical
scaleHorizontal
scaleVertical
configure
centeredHorizontal
moveHorizontal
Opacity
Layout
<
function foo() {\n \n}
function foo(bar) {\n alertOK(\"Hallo\"+bar);\n}
function foo(bar) {\n alertOK(\"Hallo\"+bar);\n}
accept this property
accept this property
accept merged property
your value:
value in PartsBin:
DiffViewer
X
M
–
My Name Is:
[enter name here]
print
ObjectEditorII
X
M
–
Scripts
Connections
+
+
-
-
// changed on Wed Mar 14 2012 16:39:32 GMT+0100 (CET) by huberthesse \nfunction onrestore() {\n this.targetMorph.onrestore();\n}\n\n\n// changed on Tue Sep 27 2011 20:25:16 GMT+0200 (CEST) by lauritz \nfunction onShutdown() {\n this.targetMorph.onShutdown();\n}\n\n\n// changed on Thu Nov 17 2011 04:59:23 GMT+0100 (CET) by lauritz \nfunction reset() {\n this.targetMorph.reset();\n}\n\n\n// changed on Thu Nov 17 2011 04:59:23 GMT+0100 (CET) by lauritz \nfunction setTarget(t) {\n this.targetMorph.setTarget(t);\n
Target:
Tag:
all
run
save
Tests
Tags:
[]
ObjectEditorII
{
}
ObjectEditorII
X
M
–
Scripts
Connections
+
+
-
-
// changed on Wed Mar 14 2012 16:39:32 GMT+0100 (CET) by huberthesse \nfunction onrestore() {\n this.targetMorph.onrestore();\n}\n\n\n// changed on Tue Sep 27 2011 20:25:16 GMT+0200 (CEST) by lauritz \nfunction onShutdown() {\n this.targetMorph.onShutdown();\n}\n\n\n// changed on Thu Nov 17 2011 04:59:23 GMT+0100 (CET) by lauritz \nfunction reset() {\n this.targetMorph.reset();\n}\n\n\n// changed on Thu Nov 17 2011 04:59:23 GMT+0100 (CET) by lauritz \nfunction setTarget(t) {\n this.targetMorph.setTarget(t);\n
Target:
Tag:
all
run
save
Tests
Tags:
[]
ObjectEditorII
{
}
check online status
Rectangle
X
M
–
R
>
Start
SyncMorph
X
M
–
Title
X
M
–
publish
Description
X
revert
release date (requested):
...
(estimated):
...
Title
/\\
\\/
1
update
save
new
force reload all
\nLiveSync
1+0+0/1
1+0+0/1
new
in prog.
other
done
UserStoryBoard
X
M
–
UserStory destroyer
merge & publish
undefined
accept
reject
DiffViewer
X
M
–
+1
0
prepare for webApp
","extent":{"__isSmartRef__":true,"id":2972},"__LivelyClassName__":"lively.morphic.Shapes.External","__SourceModuleName__":"Global.lively.morphic.Shapes"},"2969":{"init":"initHTML","appendShape":"renderHTML","setPosition":"setPositionHTML","setExtent":"setExtentHTML","setPadding":"setPaddingHTML","setFill":"setFillHTML","setBorderColor":"setBorderColorHTML","setBorderWidth":"setBorderWidthHTML","setStrokeOpacity":"setStrokeOpacityHTML","setBorderRadius":"setBorderRadiusHTML","setBorderStyle":"setBorderStyleHTML","setOpacity":"setOpacityHTML","getExtent":"getExtentHTML","initFromStringifiedShapeNode":"initFromStringifiedShapeNodeHTML"},"2970":{"x":94,"y":94,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2971":{"x":0,"y":0,"width":0,"height":0,"__LivelyClassName__":"Rectangle","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2972":{"x":94,"y":94,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2973":{"replaceRenderContext":"replaceRenderContextHTML","init":"initHTML","append":"appendHTML","remove":"removeHTML","onRenderFinished":"onRenderFinishedHTML","triggerEvent":"triggerEventHTML","setTransform":"setTransformHTML","setPosition":"setPositionHTML","setRotation":"setRotationHTML","setExtent":"setExtentHTML","setScale":"setScaleHTML","setVisible":"setVisibleHTML","adjustOrigin":"adjustOriginHTML","setPivotPoint":"setPivotPointHTML","setClipMode":"setClipModeHTML","showsVerticalScrollBar":"showsVerticalScrollBarHTML","showsHorizontalScrollBar":"showsHorizontalScrollBarHTML","getScrollBarExtent":"getScrollBarExtentHTML","setHandStyle":"setHandStyleHTML","setPointerEvents":"setPointerEventsHTML","setToolTip":"setToolTipHTML","focus":"focusHTML","blur":"blurHTML","setFocusable":"setFocusableHTML"},"2974":{"morph":{"__isSmartRef__":true,"id":2967},"__LivelyClassName__":"lively.morphic.EventHandler","__SourceModuleName__":"Global.lively.morphic.Events"},"2975":{"x":3,"y":3,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2976":{"x":0,"y":0,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2977":{"submorphs":[],"scripts":[],"shape":{"__isSmartRef__":true,"id":2978},"derivationIds":[null],"id":"F3B65875-7B33-4A79-A20F-6598756931F3","renderContextTable":{"__isSmartRef__":true,"id":2984},"_WhiteSpaceHandling":"pre-wrap","textChunks":[{"__isSmartRef__":true,"id":2985}],"eventHandler":{"__isSmartRef__":true,"id":2987},"_ClipMode":"hidden","grabbingEnabled":false,"droppingEnabled":false,"halosEnabled":true,"fixedWidth":false,"fixedHeight":false,"_InputAllowed":false,"allowInput":false,"_FontFamily":"Helvetica","_FontSize":8,"evalEnabled":false,"isLabel":true,"_HandStyle":"default","_Align":"center","eventsAreIgnored":true,"owner":{"__isSmartRef__":true,"id":2966},"_Visible":true,"priorExtent":{"__isSmartRef__":true,"id":2988},"_MaxTextWidth":null,"_MinTextWidth":null,"_MaxTextHeight":null,"_MinTextHeight":null,"_Position":{"__isSmartRef__":true,"id":2989},"__LivelyClassName__":"lively.morphic.Text","__SourceModuleName__":"Global.lively.morphic.TextCore"},"2978":{"_Position":{"__isSmartRef__":true,"id":2979},"renderContextTable":{"__isSmartRef__":true,"id":2980},"_Extent":{"__isSmartRef__":true,"id":2981},"_Padding":{"__isSmartRef__":true,"id":2982},"_BorderWidth":0,"_BorderColor":{"__isSmartRef__":true,"id":1547},"_Fill":{"__isSmartRef__":true,"id":2983},"_Opacity":0.8,"_BorderRadius":2,"__LivelyClassName__":"lively.morphic.Shapes.Rectangle","__SourceModuleName__":"Global.lively.morphic.Shapes"},"2979":{"x":10,"y":10,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2980":{"init":"initHTML","appendShape":"renderHTML","setPosition":"setPositionHTML","setExtent":"setExtentHTML","setPadding":"setPaddingHTML","setFill":"setFillHTML","setBorderColor":"setBorderColorHTML","setBorderWidth":"setBorderWidthHTML","setStrokeOpacity":"setStrokeOpacityHTML","setBorderRadius":"setBorderRadiusHTML","setBorderStyle":"setBorderStyleHTML","setOpacity":"setOpacityHTML"},"2981":{"x":69,"y":16,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2982":{"x":5,"y":2,"width":0,"height":-2,"__LivelyClassName__":"Rectangle","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2983":{"r":1,"g":1,"b":1,"a":1,"__LivelyClassName__":"Color","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2984":{"replaceRenderContext":"replaceRenderContextHTML","init":"initHTML","append":"appendHTML","remove":"removeHTML","onRenderFinished":"onRenderFinishedHTML","triggerEvent":"triggerEventHTML","setTransform":"setTransformHTML","setPosition":"setPositionHTML","setRotation":"setRotationHTML","setExtent":"setExtentHTML","setScale":"setScaleHTML","setVisible":"setVisibleHTML","adjustOrigin":"adjustOriginHTML","setPivotPoint":"setPivotPointHTML","setClipMode":"setClipModeHTML","showsVerticalScrollBar":"showsVerticalScrollBarHTML","showsHorizontalScrollBar":"showsHorizontalScrollBarHTML","getScrollBarExtent":"getScrollBarExtentHTML","setHandStyle":"setHandStyleHTML","setPointerEvents":"setPointerEventsHTML","setToolTip":"setToolTipHTML","focus":"focusHTML","blur":"blurHTML","setFocusable":"setFocusableHTML","updateText":"updateTextHTML","setTextExtent":"setTextExtentHTML","setMaxTextWidth":"setMaxTextWidthHTML","setMaxTextHeight":"setMaxTextHeightHTML","setMinTextWidth":"setMinTextWidthHTML","setMinTextHeight":"setMinTextHeightHTML","getTextExtent":"getTextExtentHTML","getTextString":"getTextStringHTML","ignoreTextEvents":"ignoreTextEventsHTML","unignoreTextEvents":"unignoreTextEventsHTML","enableTextEvents":"enableTextEventsHTML","setFontFamily":"setFontFamilyHTML","setFontSize":"setFontSizeHTML","setTextColor":"setTextColorHTML","setPadding":"setPaddingHTML","setAlign":"setAlignHTML","setVerticalAlign":"setVerticalAlignHTML","setDisplay":"setDisplayHTML","setWhiteSpaceHandling":"setWhiteSpaceHandlingHTML","focusMorph":"focusMorphHTML","setInputAllowed":"setInputAllowedHTML"},"2985":{"style":{"__isSmartRef__":true,"id":2986},"chunkOwner":{"__isSmartRef__":true,"id":2977},"storedString":"WhiteBoard","__LivelyClassName__":"lively.morphic.TextChunk","__SourceModuleName__":"Global.lively.morphic.TextCore"},"2986":{"textShadow":"0px 1px 0 rgba(255,255,255,1)","__LivelyClassName__":"lively.morphic.TextEmphasis","__SourceModuleName__":"Global.lively.morphic.TextCore"},"2987":{"morph":{"__isSmartRef__":true,"id":2977},"__LivelyClassName__":"lively.morphic.EventHandler","__SourceModuleName__":"Global.lively.morphic.Events"},"2988":{"x":69,"y":16,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2989":{"x":5.5,"y":70,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2990":{"_Position":{"__isSmartRef__":true,"id":2991},"renderContextTable":{"__isSmartRef__":true,"id":2992},"_Extent":{"__isSmartRef__":true,"id":2993},"_Padding":{"__isSmartRef__":true,"id":2994},"_BorderColor":{"__isSmartRef__":true,"id":1547},"_Fill":{"__isSmartRef__":true,"id":2995},"_BorderRadius":6,"_BorderWidth":0,"__LivelyClassName__":"lively.morphic.Shapes.Rectangle","__SourceModuleName__":"Global.lively.morphic.Shapes"},"2991":{"x":0,"y":0,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2992":{"init":"initHTML","appendShape":"renderHTML","setPosition":"setPositionHTML","setExtent":"setExtentHTML","setPadding":"setPaddingHTML","setFill":"setFillHTML","setBorderColor":"setBorderColorHTML","setBorderWidth":"setBorderWidthHTML","setStrokeOpacity":"setStrokeOpacityHTML","setBorderRadius":"setBorderRadiusHTML","setBorderStyle":"setBorderStyleHTML","setOpacity":"setOpacityHTML"},"2993":{"x":100,"y":100,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2994":{"x":0,"y":0,"width":0,"height":0,"__LivelyClassName__":"Rectangle","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2995":{"r":0.9019607843137255,"g":0.9019607843137255,"b":0.9019607843137255,"a":1,"__LivelyClassName__":"Color","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2996":{"replaceRenderContext":"replaceRenderContextHTML","init":"initHTML","append":"appendHTML","remove":"removeHTML","onRenderFinished":"onRenderFinishedHTML","triggerEvent":"triggerEventHTML","setTransform":"setTransformHTML","setPosition":"setPositionHTML","setRotation":"setRotationHTML","setExtent":"setExtentHTML","setScale":"setScaleHTML","setVisible":"setVisibleHTML","adjustOrigin":"adjustOriginHTML","setPivotPoint":"setPivotPointHTML","setClipMode":"setClipModeHTML","showsVerticalScrollBar":"showsVerticalScrollBarHTML","showsHorizontalScrollBar":"showsHorizontalScrollBarHTML","getScrollBarExtent":"getScrollBarExtentHTML","setHandStyle":"setHandStyleHTML","setPointerEvents":"setPointerEventsHTML","setToolTip":"setToolTipHTML","focus":"focusHTML","blur":"blurHTML","setFocusable":"setFocusableHTML"},"2997":{"morph":{"__isSmartRef__":true,"id":2966},"__LivelyClassName__":"lively.morphic.EventHandler","__SourceModuleName__":"Global.lively.morphic.Events"},"2998":{"x":105,"y":840,"__LivelyClassName__":"Point","__SourceModuleName__":"Global.lively.morphic.Graphics"},"2999":{"protocol":"http:","hostname":"lively-kernel.org","pathname":"/repository/webwerkstatt/PartsBin/BP2012/","__LivelyClassName__":"URL","__SourceModuleName__":"Global.lively.Network"},"3000":{"partsSpaceName":"PartsBin/BP2012/","name":"WhiteBoard","part":null,"json":null,"__LivelyClassName__":"lively.PartsBin.PartItem","__SourceModuleName__":"Global.lively.PartsBin"},"3001":{"submorphs":[{"__isSmartRef__":true,"id":3002},{"__isSmartRef__":true,"id":3012}],"scripts":[],"shape":{"__isSmartRef__":true,"id":3025},"derivationIds":[null],"id":"4CE9F2ED-AA9E-4446-A8AC-6F7FF9E054E0","renderContextTable":{"__isSmartRef__":true,"id":3031},"eventHandler":{"__isSmartRef__":true,"id":3032},"_ClipMode":"visible","droppingEnabled":false,"halosEnabled":true,"draggingEnabled":true,"accessibleInInactiveWindow":true,"_Position":{"__isSmartRef__":true,"id":3033},"partsBinURL":{"__isSmartRef__":true,"id":3034},"targetName":"WhiteBoardSocketIO","partItem":{"__isSmartRef__":true,"id":3035},"owner":{"__isSmartRef__":true,"id":1529},"isSelected":false,"__LivelyClassName__":"lively.morphic.PartsBinItem","__SourceModuleName__":"Global.lively.morphic.ScriptingSupport"},"3002":{"submorphs":[],"scripts":[],"shape":{"__isSmartRef__":true,"id":3003},"derivationIds":[null],"id":"AD1A453B-7D4C-4629-9A49-12B3BC8563B7","renderContextTable":{"__isSmartRef__":true,"id":3008},"eventHandler":{"__isSmartRef__":true,"id":3009},"_ClipMode":"visible","droppingEnabled":true,"halosEnabled":true,"eventsAreIgnored":true,"_Position":{"__isSmartRef__":true,"id":3010},"priorExtent":{"__isSmartRef__":true,"id":3011},"owner":{"__isSmartRef__":true,"id":3001},"__LivelyClassName__":"lively.morphic.Morph","__SourceModuleName__":"Global.lively.morphic.Core"},"3003":{"renderContextTable":{"__isSmartRef__":true,"id":3004},"_Extent":{"__isSmartRef__":true,"id":3005},"_Padding":{"__isSmartRef__":true,"id":3006},"stringifiedShapeNode":"
Channel: default
X
M
–
Channel: default
X
M
–