Skip to content

Commit dd9abc0

Browse files
namedgraphnamedgraph
committed
Fixed view navigation
1 parent 638f769 commit dd9abc0

2 files changed

Lines changed: 103 additions & 54 deletions

File tree

  • src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ exclude-result-prefixes="#all"
424424
<xsl:with-param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))"/>
425425
</xsl:apply-templates>
426426
</xsl:variable>
427+
427428
<!-- invoke the factory -->
428429
<xsl:sequence select="$factory(())"/>
429430
</xsl:template>

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl‎

Lines changed: 102 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,15 +1205,23 @@ exclude-result-prefixes="#all"
12051205
<!-- store the transformed query XML -->
12061206
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
12071207

1208-
<xsl:call-template name="ldh:RenderView">
1209-
<xsl:with-param name="block" select="$block"/>
1210-
<xsl:with-param name="container" select="$container"/>
1211-
<xsl:with-param name="active-mode" select="$active-mode"/>
1212-
<xsl:with-param name="select-string" select="$select-string"/>
1213-
<xsl:with-param name="select-xml" select="$select-xml"/>
1214-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1215-
<xsl:with-param name="endpoint" select="$endpoint"/>
1216-
</xsl:call-template>
1208+
<xsl:variable name="context" as="map(*)">
1209+
<xsl:call-template name="ldh:RenderView">
1210+
<xsl:with-param name="block" select="$block"/>
1211+
<xsl:with-param name="container" select="$container"/>
1212+
<xsl:with-param name="active-mode" select="$active-mode"/>
1213+
<xsl:with-param name="select-string" select="$select-string"/>
1214+
<xsl:with-param name="select-xml" select="$select-xml"/>
1215+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1216+
<xsl:with-param name="endpoint" select="$endpoint"/>
1217+
</xsl:call-template>
1218+
</xsl:variable>
1219+
1220+
<ixsl:promise select="
1221+
ixsl:resolve($context) =>
1222+
ixsl:then(ldh:view-results-thunk#1)
1223+
"
1224+
on-failure="ldh:promise-failure#1"/>
12171225
</xsl:template>
12181226

12191227
<!-- pager next links -->
@@ -1247,15 +1255,23 @@ exclude-result-prefixes="#all"
12471255
<!-- store the transformed query XML -->
12481256
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
12491257

1250-
<xsl:call-template name="ldh:RenderView">
1251-
<xsl:with-param name="block" select="$block"/>
1252-
<xsl:with-param name="container" select="$container"/>
1253-
<xsl:with-param name="active-mode" select="$active-mode"/>
1254-
<xsl:with-param name="select-string" select="$select-string"/>
1255-
<xsl:with-param name="select-xml" select="$select-xml"/>
1256-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1257-
<xsl:with-param name="endpoint" select="$endpoint"/>
1258-
</xsl:call-template>
1258+
<xsl:variable name="context" as="map(*)">
1259+
<xsl:call-template name="ldh:RenderView">
1260+
<xsl:with-param name="block" select="$block"/>
1261+
<xsl:with-param name="container" select="$container"/>
1262+
<xsl:with-param name="active-mode" select="$active-mode"/>
1263+
<xsl:with-param name="select-string" select="$select-string"/>
1264+
<xsl:with-param name="select-xml" select="$select-xml"/>
1265+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1266+
<xsl:with-param name="endpoint" select="$endpoint"/>
1267+
</xsl:call-template>
1268+
</xsl:variable>
1269+
1270+
<ixsl:promise select="
1271+
ixsl:resolve($context) =>
1272+
ixsl:then(ldh:view-results-thunk#1)
1273+
"
1274+
on-failure="ldh:promise-failure#1"/>
12591275
</xsl:template>
12601276

12611277
<!-- order by onchange -->
@@ -1288,15 +1304,23 @@ exclude-result-prefixes="#all"
12881304
<!-- store the transformed query XML -->
12891305
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
12901306

1291-
<xsl:call-template name="ldh:RenderView">
1292-
<xsl:with-param name="block" select="$block"/>
1293-
<xsl:with-param name="container" select="$container"/>
1294-
<xsl:with-param name="active-mode" select="$active-mode"/>
1295-
<xsl:with-param name="select-string" select="$select-string"/>
1296-
<xsl:with-param name="select-xml" select="$select-xml"/>
1297-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1298-
<xsl:with-param name="endpoint" select="$endpoint"/>
1299-
</xsl:call-template>
1307+
<xsl:variable name="context" as="map(*)">
1308+
<xsl:call-template name="ldh:RenderView">
1309+
<xsl:with-param name="block" select="$block"/>
1310+
<xsl:with-param name="container" select="$container"/>
1311+
<xsl:with-param name="active-mode" select="$active-mode"/>
1312+
<xsl:with-param name="select-string" select="$select-string"/>
1313+
<xsl:with-param name="select-xml" select="$select-xml"/>
1314+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1315+
<xsl:with-param name="endpoint" select="$endpoint"/>
1316+
</xsl:call-template>
1317+
</xsl:variable>
1318+
1319+
<ixsl:promise select="
1320+
ixsl:resolve($context) =>
1321+
ixsl:then(ldh:view-results-thunk#1)
1322+
"
1323+
on-failure="ldh:promise-failure#1"/>
13001324
</xsl:template>
13011325

13021326
<!-- ascending/descending onclick -->
@@ -1328,15 +1352,23 @@ exclude-result-prefixes="#all"
13281352
<!-- store the transformed query XML -->
13291353
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
13301354

1331-
<xsl:call-template name="ldh:RenderView">
1332-
<xsl:with-param name="block" select="$block"/>
1333-
<xsl:with-param name="container" select="$container"/>
1334-
<xsl:with-param name="active-mode" select="$active-mode"/>
1335-
<xsl:with-param name="select-string" select="$select-string"/>
1336-
<xsl:with-param name="select-xml" select="$select-xml"/>
1337-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1338-
<xsl:with-param name="endpoint" select="$endpoint"/>
1339-
</xsl:call-template>
1355+
<xsl:variable name="context" as="map(*)">
1356+
<xsl:call-template name="ldh:RenderView">
1357+
<xsl:with-param name="block" select="$block"/>
1358+
<xsl:with-param name="container" select="$container"/>
1359+
<xsl:with-param name="active-mode" select="$active-mode"/>
1360+
<xsl:with-param name="select-string" select="$select-string"/>
1361+
<xsl:with-param name="select-xml" select="$select-xml"/>
1362+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1363+
<xsl:with-param name="endpoint" select="$endpoint"/>
1364+
</xsl:call-template>
1365+
</xsl:variable>
1366+
1367+
<ixsl:promise select="
1368+
ixsl:resolve($context) =>
1369+
ixsl:then(ldh:view-results-thunk#1)
1370+
"
1371+
on-failure="ldh:promise-failure#1"/>
13401372

13411373
<!-- toggle the arrow direction -->
13421374
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'btn-order-by-desc' ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -1470,15 +1502,23 @@ exclude-result-prefixes="#all"
14701502
<!-- store the transformed query XML -->
14711503
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
14721504

1473-
<xsl:call-template name="ldh:RenderView">
1474-
<xsl:with-param name="block" select="$block"/>
1475-
<xsl:with-param name="container" select="$container"/>
1476-
<xsl:with-param name="active-mode" select="$active-mode"/>
1477-
<xsl:with-param name="select-string" select="$select-string"/>
1478-
<xsl:with-param name="select-xml" select="$select-xml"/>
1479-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1480-
<xsl:with-param name="endpoint" select="$endpoint"/>
1481-
</xsl:call-template>
1505+
<xsl:variable name="context" as="map(*)">
1506+
<xsl:call-template name="ldh:RenderView">
1507+
<xsl:with-param name="block" select="$block"/>
1508+
<xsl:with-param name="container" select="$container"/>
1509+
<xsl:with-param name="active-mode" select="$active-mode"/>
1510+
<xsl:with-param name="select-string" select="$select-string"/>
1511+
<xsl:with-param name="select-xml" select="$select-xml"/>
1512+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1513+
<xsl:with-param name="endpoint" select="$endpoint"/>
1514+
</xsl:call-template>
1515+
</xsl:variable>
1516+
1517+
<ixsl:promise select="
1518+
ixsl:resolve($context) =>
1519+
ixsl:then(ldh:view-results-thunk#1)
1520+
"
1521+
on-failure="ldh:promise-failure#1"/>
14821522
</xsl:template>
14831523

14841524
<!-- parallax onclick -->
@@ -1510,15 +1550,23 @@ exclude-result-prefixes="#all"
15101550
<!-- store the transformed query XML -->
15111551
<ixsl:set-property name="select-xml" select="$select-xml" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
15121552

1513-
<xsl:call-template name="ldh:RenderView">
1514-
<xsl:with-param name="block" select="$block"/>
1515-
<xsl:with-param name="container" select="$container"/>
1516-
<xsl:with-param name="active-mode" select="$active-mode"/>
1517-
<xsl:with-param name="select-string" select="$select-string"/>
1518-
<xsl:with-param name="select-xml" select="$select-xml"/>
1519-
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1520-
<xsl:with-param name="endpoint" select="$endpoint"/>
1521-
</xsl:call-template>
1553+
<xsl:variable name="context" as="map(*)">
1554+
<xsl:call-template name="ldh:RenderView">
1555+
<xsl:with-param name="block" select="$block"/>
1556+
<xsl:with-param name="container" select="$container"/>
1557+
<xsl:with-param name="active-mode" select="$active-mode"/>
1558+
<xsl:with-param name="select-string" select="$select-string"/>
1559+
<xsl:with-param name="select-xml" select="$select-xml"/>
1560+
<xsl:with-param name="initial-var-name" select="$initial-var-name"/>
1561+
<xsl:with-param name="endpoint" select="$endpoint"/>
1562+
</xsl:call-template>
1563+
</xsl:variable>
1564+
1565+
<ixsl:promise select="
1566+
ixsl:resolve($context) =>
1567+
ixsl:then(ldh:view-results-thunk#1)
1568+
"
1569+
on-failure="ldh:promise-failure#1"/>
15221570
</xsl:template>
15231571

15241572
<!-- CALLBACKS -->

0 commit comments

Comments
 (0)