Skip to content

Commit

Permalink
Re-Adding new markdown code from paulbartrum, enabling /u/quinnd link…
Browse files Browse the repository at this point in the history
…ing, adding padding fix to wrok around layout cycle bug.
  • Loading branch information
QuinnDamerell committed Jan 20, 2016
1 parent 2e78773 commit c12648c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions Baconit/HelperControls/CommentBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<!-- Note we have to enable depedent animation, but it is ok here -->
<DoubleAnimation Duration="00:00:00.5"
EnableDependentAnimation="True"
From="0"
From="20"
Storyboard.TargetName="ui_livePreviewGrid"
Storyboard.TargetProperty="MinHeight"
To="208">
Expand Down Expand Up @@ -162,7 +162,7 @@
From="208"
Storyboard.TargetName="ui_livePreviewGrid"
Storyboard.TargetProperty="MinHeight"
To="0">
To="20">
<DoubleAnimation.EasingFunction>
<QuinticEase EasingMode="EaseOut" />
</DoubleAnimation.EasingFunction>
Expand Down Expand Up @@ -203,15 +203,17 @@

<!-- Live markdown grid -->
<Grid x:Name="ui_livePreviewGrid"
MinHeight="20"
MaxHeight="208"
Background="{StaticResource BaconitAccentColorLevel4Brush}">
<ScrollViewer x:Name="ui_livePreviewScroller"
Padding="18,6,18,6"
Style="{StaticResource ScrollViewerStyle}"
VerticalScrollBarVisibility="Auto"
ZoomMode="Disabled">
<!-- the live preview box -->
<universalMarkdown:MarkdownTextBlock x:Name="ui_livePreviewBox"
Margin="18,6,18,6"
MinHeight="20"
OnMarkdownLinkTapped="LivePreviewBox_OnMarkdownLinkTapped" />
</ScrollViewer>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion Baconit/Panels/Search.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
-->
<universalMarkdown:MarkdownTextBlock Grid.Row="2"
Foreground="#999999"
IsHitTestVisible="False"
IsTextSelectionEnabled="False"
Markdown="{x:Bind MarkdownText}"
OnMarkdownLinkTapped="MarkdownTextBlock_OnMarkdownLinkTapped"
Visibility="{x:Bind ShowMarkdownText}" />
Expand Down
2 changes: 1 addition & 1 deletion UniversalMarkdown
Submodule UniversalMarkdown updated 91 files
+19 −19 UniversalMarkdown.sln
+198 −0 UniversalMarkdown/Display/MarkdownTable.cs
+0 −496 UniversalMarkdown/Display/RenderToRichTextBlock.cs
+1,098 −0 UniversalMarkdown/Display/XamlRenderer.cs
+151 −242 UniversalMarkdown/Helpers/Common.cs
+1 −1 UniversalMarkdown/Interfaces/ILinkRegister.cs
+0 −5 UniversalMarkdown/MarkdownTextBlock.xaml
+743 −64 UniversalMarkdown/MarkdownTextBlock.xaml.cs
+82 −64 UniversalMarkdown/Parse/Blocks/CodeBlock.cs
+103 −57 UniversalMarkdown/Parse/Blocks/HeaderBlock.cs
+31 −55 UniversalMarkdown/Parse/Blocks/HorizontalRuleBlock.cs
+0 −110 UniversalMarkdown/Parse/Blocks/LinkBreakBlock.cs
+247 −0 UniversalMarkdown/Parse/Blocks/ListBlock.cs
+0 −203 UniversalMarkdown/Parse/Blocks/ListElementBlock.cs
+23 −26 UniversalMarkdown/Parse/Blocks/ParagraphBlock.cs
+21 −66 UniversalMarkdown/Parse/Blocks/QuoteBlock.cs
+279 −0 UniversalMarkdown/Parse/Blocks/TableBlock.cs
+58 −62 UniversalMarkdown/Parse/Inlines/BoldTextInline.cs
+107 −0 UniversalMarkdown/Parse/Inlines/CodeInline.cs
+30 −0 UniversalMarkdown/Parse/Inlines/IInlineContainer.cs
+28 −0 UniversalMarkdown/Parse/Inlines/IInlineLeaf.cs
+35 −0 UniversalMarkdown/Parse/Inlines/ILinkElement.cs
+55 −67 UniversalMarkdown/Parse/Inlines/ItalicTextInline.cs
+68 −107 UniversalMarkdown/Parse/Inlines/MarkdownLinkInline.cs
+100 −68 UniversalMarkdown/Parse/Inlines/RawHyperlinkInline.cs
+0 −127 UniversalMarkdown/Parse/Inlines/RawSubredditInline.cs
+133 −0 UniversalMarkdown/Parse/Inlines/RedditLinkInline.cs
+96 −0 UniversalMarkdown/Parse/Inlines/StrikethroughTextInline.cs
+98 −0 UniversalMarkdown/Parse/Inlines/SuperscriptTextInline.cs
+335 −73 UniversalMarkdown/Parse/Inlines/TextRunInline.cs
+221 −78 UniversalMarkdown/Parse/Markdown.cs
+27 −6 UniversalMarkdown/Parse/MarkdownBlock.cs
+0 −54 UniversalMarkdown/Parse/MarkdownElement.cs
+8 −5 UniversalMarkdown/Parse/MarkdownInline.cs
+12 −5 UniversalMarkdown/UniversalMarkdown.csproj
+0 −14,573 UniversalMarkdown/project.lock.json
+0 −0 UniversalMarkdownTestApp/App.xaml
+0 −0 UniversalMarkdownTestApp/App.xaml.cs
+0 −0 UniversalMarkdownTestApp/ApplicationInsights.config
+ UniversalMarkdownTestApp/Assets/LockScreenLogo.scale-200.png
+ UniversalMarkdownTestApp/Assets/SplashScreen.scale-200.png
+ UniversalMarkdownTestApp/Assets/Square150x150Logo.scale-200.png
+ UniversalMarkdownTestApp/Assets/Square44x44Logo.scale-200.png
+ UniversalMarkdownTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+ UniversalMarkdownTestApp/Assets/StoreLogo.png
+ UniversalMarkdownTestApp/Assets/Wide310x150Logo.scale-200.png
+57 −0 UniversalMarkdownTestApp/Code/ImmediateSourceUpdate.cs
+325 −0 UniversalMarkdownTestApp/InitialContent.md
+79 −0 UniversalMarkdownTestApp/MainPage.xaml
+283 −0 UniversalMarkdownTestApp/MainPage.xaml.cs
+0 −0 UniversalMarkdownTestApp/Package.appxmanifest
+0 −0 UniversalMarkdownTestApp/Properties/AssemblyInfo.cs
+0 −0 UniversalMarkdownTestApp/Properties/Default.rd.xml
+4 −3 UniversalMarkdownTestApp/UniversalMarkdownTestApp.csproj
+0 −27 UniversalMarkdownTestApp/UniversalMarkdownTestApp/MainPage.xaml
+0 −36 UniversalMarkdownTestApp/UniversalMarkdownTestApp/MainPage.xaml.cs
+0 −156 UniversalMarkdownTestApp/UniversalMarkdownTestApp/UniversalMarkdownTextBlock.csproj
+0 −14,843 UniversalMarkdownTestApp/UniversalMarkdownTestApp/project.lock.json
+0 −0 UniversalMarkdownTestApp/project.json
+0 −83 UniversalMarkdownUnitTests/Display/BoldTests.cs
+0 −77 UniversalMarkdownUnitTests/Display/BulletedListTests.cs
+0 −126 UniversalMarkdownUnitTests/Display/CodeTests.cs
+0 −47 UniversalMarkdownUnitTests/Display/DisplayTestBase.cs
+0 −18 UniversalMarkdownUnitTests/Display/EscapeTests.cs
+0 −137 UniversalMarkdownUnitTests/Display/HeaderTests.cs
+0 −97 UniversalMarkdownUnitTests/Display/HorizontalRuleTests.cs
+0 −119 UniversalMarkdownUnitTests/Display/HyperlinkTests.cs
+0 −124 UniversalMarkdownUnitTests/Display/ItalicTests.cs
+0 −45 UniversalMarkdownUnitTests/Display/NumberedListTests.cs
+0 −98 UniversalMarkdownUnitTests/Display/ParagraphTests.cs
+0 −83 UniversalMarkdownUnitTests/Display/QuoteTests.cs
+0 −31 UniversalMarkdownUnitTests/Display/StrikethroughTests.cs
+0 −53 UniversalMarkdownUnitTests/Display/SuperscriptTests.cs
+0 −79 UniversalMarkdownUnitTests/Display/TableTests.cs
+86 −0 UniversalMarkdownUnitTests/Parse/BoldTests.cs
+185 −0 UniversalMarkdownUnitTests/Parse/CodeTests.cs
+183 −0 UniversalMarkdownUnitTests/Parse/HeaderTests.cs
+107 −0 UniversalMarkdownUnitTests/Parse/HorizontalRuleTests.cs
+265 −0 UniversalMarkdownUnitTests/Parse/HyperlinkTests.cs
+141 −0 UniversalMarkdownUnitTests/Parse/ItalicTests.cs
+136 −0 UniversalMarkdownUnitTests/Parse/ListTests.cs
+106 −0 UniversalMarkdownUnitTests/Parse/MarkdownLinkTests.cs
+387 −0 UniversalMarkdownUnitTests/Parse/ParagraphTests.cs
+32 −0 UniversalMarkdownUnitTests/Parse/ParseTestBase.cs
+71 −0 UniversalMarkdownUnitTests/Parse/ParseTestExtensionMethods.cs
+172 −0 UniversalMarkdownUnitTests/Parse/QuoteTests.cs
+139 −0 UniversalMarkdownUnitTests/Parse/RedditLinkTests.cs
+78 −0 UniversalMarkdownUnitTests/Parse/StrikethroughTests.cs
+120 −0 UniversalMarkdownUnitTests/Parse/SuperscriptTests.cs
+249 −0 UniversalMarkdownUnitTests/Parse/TableTests.cs
+17 −16 UniversalMarkdownUnitTests/UniversalMarkdownUnitTests.csproj

0 comments on commit c12648c

Please sign in to comment.