Merge pull request #31 from ba-st/issue_115

Upstream changes
ba-st · May 13, 2018 · 483c8aa · 483c8aa
2 parents acc758b + 5e1cb52
commit 483c8aa
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 44 deletions.
diff --git a/source/BaselineOfWillowPlayground/BaselineOfWillowPlayground.class.st b/source/BaselineOfWillowPlayground/BaselineOfWillowPlayground.class.st
@@ -16,9 +16,9 @@ BaselineOfWillowPlayground >> baseline: spec [
 		do: [ self setUpDependencies: spec.
 			spec
 				package: 'Willow-Playground-Smalltalks2017'
-					with: [ spec requires: #('WillowBootstrap' 'WillowJQueryUI' 'WillowSpinKit') ];
+					with: [ spec requires: #('WillowBootstrap' 'WillowSpinKit') ];
 				package: 'Willow-Playground-TestRunner'
-					with: [ spec requires: #('WillowBootstrap' 'WillowJQueryUI' 'WillowSpinKit') ];
+					with: [ spec requires: #('WillowBootstrap' 'WillowSpinKit') ];
 				package: 'Willow-Playground-LiveDocs'
 					with: [ spec requires: #('WillowBootstrap' 'WillowSpinKit') ];
 				group: 'default'
@@ -32,17 +32,10 @@ BaselineOfWillowPlayground >> setUpDependencies: spec [
 	spec
 		baseline: 'WillowBootstrap'
 			with: [ spec
-				repository: 'github://ba-st/Willow-Bootstrap:v8/source';
+				repository: 'github://ba-st/Willow-Bootstrap:v9/source';
 				loads: #('Deployment') ];
 		import: 'WillowBootstrap'.
 
-	spec
-		baseline: 'WillowJQueryUI'
-			with: [ spec
-				repository: 'github://ba-st/Willow-JQueryUI:v7/source';
-				loads: #('Deployment') ];
-		import: 'WillowJQueryUI'.
-
 	spec
 		baseline: 'WillowSpinKit'
 			with: [ spec

diff --git a/source/Willow-Playground-Smalltalks2017/AdvancedComponentsExampleStepWebView.class.st b/source/Willow-Playground-Smalltalks2017/AdvancedComponentsExampleStepWebView.class.st
@@ -55,10 +55,11 @@ AdvancedComponentsExampleStepWebView >> initializePeriodical [
 
 { #category : #initialization }
 AdvancedComponentsExampleStepWebView >> initializeTable [
+
 	table := TableWebViewBuilder new
-	  addColumnTitled: 'Decimal' rendering: [ :number | number ];
-	  addColumnTitled: 'Hex' rendering: [ :number | number printStringHex ];
-	  addColumnTitled: 'Roman' rendering: [ :number | number printStringRoman ];
+	  addColumn: [:column | column titled: 'Decimal'; rendering: [ :number | number ]];
+	  addColumn: [:column | column titled: 'Hex'; rendering: [ :number | number printStringHex ]];
+	  addColumn: [:column | column titled: 'Roman'; rendering: [ :number | number printStringRoman ]];
 	  buildApplying: [ :theTable | theTable addClass bootstrap table ].
 	table changeContentsTo: #(26 51 78)
 ]

diff --git a/source/Willow-Playground-Smalltalks2017/ProjectLocationStepWebView.class.st b/source/Willow-Playground-Smalltalks2017/ProjectLocationStepWebView.class.st
@@ -59,10 +59,21 @@ ProjectLocationStepWebView >> projectsTableView [
 
 	tableBuilder := self componentSupplier tableBuilder.
 	tableBuilder
-		addColumnTitled: 'Project' rendering: [ :info | info at: 1 ];
-		addColumnTitled: 'Content' rendering: [ :info | info at: 2 ];
-		addColumnTitled: 'Status' rendering: [ :info | info at: 3 ];
-		addUntitledColumnRendering: [ :info | self componentSupplier asynchronicLinkLabeled: (info at: 4) applying: (OpenLocationCommand forNewBrowsingContextNavigatingTo: ('https://github.com/<1s>' expandMacrosWith: (info at: 4))) ].
+		addColumn: [ :column | 
+			column
+				titled: 'Project';
+				rendering: [ :info | info at: 1 ] ];
+		addColumn: [ :column | 
+			column
+				titled: 'Content';
+				rendering: [ :info | info at: 2 ] ];
+		addColumn: [ :column | 
+			column
+				titled: 'Status';
+				rendering: [ :info | info at: 3 ] ];
+		addColumn: [ :column | 
+			column
+				rendering: [ :info | self componentSupplier asynchronicLinkLabeled: (info at: 4) applying: (OpenLocationCommand forNewBrowsingContextNavigatingTo: ('https://github.com/<1s>' expandMacrosWith: (info at: 4))) ] ].
 	projectTable := tableBuilder buildApplying: [ :table | table addClass bootstrap tableCondensed ].
 
 	projectTable changeContentsTo: self projectsWithLocations.

diff --git a/source/Willow-Playground-Smalltalks2017/Smalltalks2017FileMetadataLibrary.class.st b/source/Willow-Playground-Smalltalks2017/Smalltalks2017FileMetadataLibrary.class.st
diff --git a/source/Willow-Playground-TestRunner/WPMessageTallyWebView.class.st b/source/Willow-Playground-TestRunner/WPMessageTallyWebView.class.st
@@ -97,16 +97,24 @@ WPMessageTallyWebView >> renderLeavesOn: html [
 	html render: (self headingRendering: 'Leaves').
 
 	leavesTable := self componentSupplier tableBuilder
-		addColumnTitled: 'Percent'
-			rendering: [ :node | self formattedPercentagFor: node ]
-			applyingToCells: [ :cell | cell addClass bootstrap textRight ]
-			applyingToHeading: [  ];
-		addColumnTitled: 'Time (ms)'
-			rendering: [ :node | self timeFor: node ]
-			applyingToCells: [ :cell | cell addClass bootstrap textRight ]
-			applyingToHeading: [  ];
-		addColumnTitled: 'Class' rendering: [ :node | [ :canvas | canvas strong: node method methodClass ] ];
-		addColumnTitled: 'Selector' rendering: [ :node | node method selector ];
+		addColumn: [ :column | 
+			column
+				titled: 'Percent';
+				rendering: [ :node | self formattedPercentagFor: node ];
+				applyingToCells: [ :cell | cell addClass bootstrap textRight ] ];
+		addColumn: [ :column | 
+			column
+				titled: 'Time (ms)';
+				rendering: [ :node | self timeFor: node ];
+				applyingToCells: [ :cell | cell addClass bootstrap textRight ] ];
+		addColumn: [ :column | 
+			column
+				titled: 'Class';
+				rendering: [ :node | [ :canvas | canvas strong: node method methodClass ] ] ];
+		addColumn: [ :column | 
+			column
+				titled: 'Selector';
+				rendering: [ :node | node method selector ] ];
 		build.
 
 	leavesTable changeContentsTo: self tallyLeavesSorted.

diff --git a/source/Willow-Playground-TestRunner/WPTestRunnerTestResultDetailsDialog.class.st b/source/Willow-Playground-TestRunner/WPTestRunnerTestResultDetailsDialog.class.st
@@ -51,14 +51,14 @@ WPTestRunnerTestResultDetailsDialog >> renderErrorsFor: aTestResult on: html [
 			html render: (HeadingWebView displaying: ('Errors (<1p>)' expandMacrosWith: aTestResult errorCount) withLevel: 4 applying: [ :heading | heading addClass bootstrap textDanger ]).
 
 			errorsTable := self componentSupplier tableBuilder
-				addColumnTitled: 'Class'
-					rendering: [ :failure | failure class name ]
-					applyingToCells: [  ]
-					applyingToHeading: [ :headingCell | headingCell addClass bootstrap textDanger ];
-				addColumnTitled: 'Selector'
-					rendering: [ :failure | failure selector ]
-					applyingToCells: [  ]
-					applyingToHeading: [ :headingCell | headingCell addClass bootstrap textDanger ];
+				addColumn: [ :column | 
+					column
+						titled: 'Class' applying: [ :headingCell | headingCell addClass bootstrap textDanger ];
+						rendering: [ :failure | failure class name ] ];
+				addColumn: [ :column | 
+					column
+						titled: 'Selector' applying: [ :headingCell | headingCell addClass bootstrap textDanger ];
+						rendering: [ :failure | failure selector ] ];
 				build.
 			errorsTable changeContentsTo: aTestResult errors.
 			html render: errorsTable ]
@@ -73,14 +73,14 @@ WPTestRunnerTestResultDetailsDialog >> renderFailuresFor: aTestResult on: html [
 			html render: (HeadingWebView displaying: ('Failures (<1p>)' expandMacrosWith: aTestResult failureCount) withLevel: 4 applying: [ :heading | heading addClass bootstrap textWarning ]).
 
 			failuresTable := self componentSupplier tableBuilder
-				addColumnTitled: 'Class'
-					rendering: [ :failure | failure class name ]
-					applyingToCells: [  ]
-					applyingToHeading: [ :headingCell | headingCell addClass bootstrap textWarning ];
-				addColumnTitled: 'Selector'
-					rendering: [ :failure | failure selector ]
-					applyingToCells: [  ]
-					applyingToHeading: [ :headingCell | headingCell addClass bootstrap textWarning ];
+				addColumn: [ :column | 
+					column
+						titled: 'Class' applying: [ :headingCell | headingCell addClass bootstrap textWarning ];
+						rendering: [ :failure | failure class name ] ];
+				addColumn: [ :column | 
+					column
+						titled: 'Selector' applying: [ :headingCell | headingCell addClass bootstrap textWarning ];
+						rendering: [ :failure | failure selector ] ];
 				build.
 			failuresTable changeContentsTo: aTestResult failures.
 			html render: failuresTable ]