Skip to content

Commit

Permalink
2sxc 14 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
getBlup committed Jul 4, 2022
1 parent 89978c9 commit 5439561
Show file tree
Hide file tree
Showing 10 changed files with 2,782 additions and 2,590 deletions.
6 changes: 3 additions & 3 deletions .data/app.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="13.10.02" ExportDate="2022-05-10T13:38:29.7880277+02:00">
<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.04.02" ModuleVersion="14.07.00" ExportDate="2022-06-30T14:46:38.6634992+02:00">
<Header>
<App Guid="1566f9d3-9580-4b0d-83de-51d34b04c5f7" />
<Language Default="en-us" />
Expand Down Expand Up @@ -934,13 +934,13 @@
<Value Key="RequiredOqtaneVersion" Value="03.01.00" Type="String">
<Dimension DimensionID="7" ReadOnly="false" />
</Value>
<Value Key="RequiredVersion" Value="13.10.00" Type="String">
<Value Key="RequiredVersion" Value="14.07.00" Type="String">
<Dimension DimensionID="7" ReadOnly="false" />
</Value>
<Value Key="SupportsAjaxReload" Value="True" Type="Boolean">
<Dimension DimensionID="7" ReadOnly="false" />
</Value>
<Value Key="Version" Value="02.01.00" Type="String">
<Value Key="Version" Value="02.02.00" Type="String">
<Dimension DimensionID="7" ReadOnly="false" />
</Value>
</Entity>
Expand Down
Binary file added .temp_cache/default-production/0.pack.gz
Binary file not shown.
Binary file added .temp_cache/default-production/index.pack.gz
Binary file not shown.
11 changes: 4 additions & 7 deletions _QRCode.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@inherits Custom.Hybrid.Razor12
@inherits Custom.Hybrid.Razor14
@using ToSic.Razor.Blade;
@using ToSic.Sxc.Services;
@{
// The view identifier determines if the code should be visible or only on printing
var printOnly = CmsContext.View.Identifier == "print";
Expand Down Expand Up @@ -40,10 +39,8 @@
// Use either the qr-code settings of the current item or use the defaults
var qrParams = Content.QrCodeSettings.EntityId != 0 ? Content.QrCodeSettings : App.Settings.QrCodeSettings;

var pageSvc = GetService<IPageService>();

// Activate turnOn - see https://r.2sxc.org/turnon
pageSvc.Activate("turnOn");
Kit.Page.Activate("turnOn");

// Passed to QrCode generation
var qrCodeOptions = new {
Expand All @@ -53,5 +50,5 @@
};
}

<turnOn turn-on='{ "run": "window.appQr2.init()", "data": { "domId": "@qrDomId", "options": @Html.Raw(Convert.Json.ToJson(qrCodeOptions)) }}'></turnOn>
<script type="text/javascript" src="@App.Path/dist/scripts.min.js" @pageSvc.AssetAttributes(position:"bottom" )></script>
<turnOn turn-on='{ "run": "window.appQr2.init()", "data": { "domId": "@qrDomId", "options": @Html.Raw(Kit.Json.ToJson(qrCodeOptions)) }}'></turnOn>
<script type="text/javascript" src="@App.Path/dist/scripts.min.js" @Kit.Page.AssetAttributes(position:"bottom" )></script>
2 changes: 1 addition & 1 deletion dist/scripts.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/scripts.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 5439561

Please sign in to comment.