Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breaking/tdr 9/handlebars 4 upgrade #139

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Breaking/tdr 9/handlebars 4 upgrade #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2e475b
breaking: bundle all PCIs using Handlebars 4
oatymart Sep 18, 2023
7a16a55
feat: migration to register updated PCIs
oatymart Sep 20, 2023
8c179cd
fix: replace nested .. usages in ims/textReaderInteraction
oatymart Sep 27, 2023
259ec22
fix: replace nested .. usages in dev/textReaderInteraction
oatymart Sep 27, 2023
187d4bf
chore: rebundle both PCIs
oatymart Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions migrations/Version202309191438454106_pciSamples.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

declare(strict_types=1);

namespace oat\pciSamples\migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\Exception\IrreversibleMigration;
use oat\tao\scripts\tools\migrations\AbstractMigration;
use oat\pciSamples\scripts\install\RegisterPciTextReaderOAT;
use oat\pciSamples\scripts\install\RegisterPciTextReaderIMS;

/**
* Auto-generated Migration: Please modify to your needs!
*
* phpcs:disable Squiz.Classes.ValidClassName
*/
final class Version202309191438454106_pciSamples extends AbstractMigration
{
public function getDescription(): string
{
return 'Update TextReader OAT & IMS PCIs to work with Handlebars 4';
}

public function up(Schema $schema): void
{
$this->addReport(
$this->propagate(
new RegisterPciTextReaderOAT()
)(
['1.0.0']
)
);

$this->addReport(
$this->propagate(
new RegisterPciTextReaderIMS()
)(
['2.0.0']
)
);
}

public function down(Schema $schema): void
{
throw new IrreversibleMigration(
'In order to undo this migration, restore the pre-Handlebars-4 versions of all the PCIs and run their registration scripts'
);
}
}
12 changes: 6 additions & 6 deletions views/js/pciCreator/dev/textReaderInteraction/creator/tpl/markup.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</li>
\{{/each}}
</ul>
\{{/if}}
\{{/if}}
<div class="tr-pages-wrap clearfix">
<div class="tr-pages" style="height: \{{pageWrapperHeight}}px">
\{{#each pages}}
Expand All @@ -34,20 +34,20 @@
</div>
</div>
]]>
</script>
<script class="text-reader-nav-tpl" type="text/x-handlebars-template">
</script>
<script class="text-reader-nav-tpl" type="text/x-handlebars-template">
<![CDATA[
\{{#if showNavigation}}
<div class="tr-nav-wrap tr-nav-\{{tabsPosition}}">
<div class="tr-nav">
<div class="tr-nav__col js-prev-page">
<button class="btn-info small">\{{../buttonLabels.prev}}</button>
<button class="btn-info small">\{{buttonLabels.prev}}</button>
</div>
<div class="tr-nav__col">
{{__ "Page"}} <span class="js-current-page">\{{../currentPage}}</span> / \{{../pagesNum}}
{{__ "Page"}} <span class="js-current-page">\{{currentPage}}</span> / \{{pagesNum}}
</div>
<div class="tr-nav__col js-next-page">
<button class="btn-info small">\{{../buttonLabels.next}}</button>
<button class="btn-info small">\{{buttonLabels.next}}</button>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions views/js/pciCreator/dev/textReaderInteraction/creator/tpl/navigation.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<div class="tr-nav-wrap tr-nav-{{tabsPosition}}">
<div class="tr-nav">
<div class="tr-nav__col js-prev-page">
<button class="btn-info small">{{../buttonLabels.prev}}</button>
<button class="btn-info small">{{buttonLabels.prev}}</button>
</div>
<div class="tr-nav__col">
{{__ "Page"}} <span class="js-current-page">{{../currentPage}}</span> / {{../pagesNum}}
{{__ "Page"}} <span class="js-current-page">{{currentPage}}</span> / {{pagesNum}}
</div>
<div class="tr-nav__col js-next-page">
<button class="btn-info small">{{../buttonLabels.next}}</button>
<button class="btn-info small">{{buttonLabels.next}}</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/js/pciCreator/dev/textReaderInteraction/pciCreator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"typeIdentifier": "textReaderInteraction",
"label": "Text reader",
"description": "The Paging widget combines a scrolling widget with additional paging controls.",
"version": "0.9.0",
"version": "1.0.0",
"author": "Aleh Hutnikau",
"email": "contact@taotesting.com",
"tags": [
Expand Down
4 changes: 2 additions & 2 deletions views/js/pciCreator/dev/textReaderInteraction/runtime/js/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(
[
'taoQtiItem/portableLib/jquery_2_1_1',
'taoQtiItem/portableLib/lodash',
'taoQtiItem/portableLib/handlebars',
'taoQtiItem/portableLib/handlebars_4',
'textReaderInteraction/runtime/js/tabs',
'taoQtiItem/portableLib/OAT/util/html',
'taoQtiItem/portableLib/jquery.qtip'
Expand All @@ -26,7 +26,7 @@ define(
return $1 + resolved + $3;
});
};

return function (options) {
var self = this;
var defaultOptions = {
Expand Down
10,848 changes: 10,392 additions & 456 deletions views/js/pciCreator/dev/textReaderInteraction/runtime/textReaderInteraction.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/pciCreator/dev/textReaderInteraction/runtime/textReaderInteraction.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions views/js/pciCreator/ims/textReaderInteraction/creator/tpl/markup.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<div class="tr-nav-wrap tr-nav-\{{tabsPosition}}">
<div class="tr-nav">
<div class="tr-nav__col js-prev-page">
<button class="btn-info small">\{{../buttonLabels.prev}}</button>
<button class="btn-info small">\{{buttonLabels.prev}}</button>
</div>
<div class="tr-nav__col">
{{__ "Page"}} <span class="js-current-page">\{{../currentPage}}</span> / \{{../pagesNum}}
{{__ "Page"}} <span class="js-current-page">\{{currentPage}}</span> / \{{pagesNum}}
</div>
<div class="tr-nav__col js-next-page">
<button class="btn-info small">\{{../buttonLabels.next}}</button>
<button class="btn-info small">\{{buttonLabels.next}}</button>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions views/js/pciCreator/ims/textReaderInteraction/creator/tpl/navigation.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<div class="tr-nav-wrap tr-nav-{{tabsPosition}}">
<div class="tr-nav">
<div class="tr-nav__col js-prev-page">
<button class="btn-info small">{{../buttonLabels.prev}}</button>
<button class="btn-info small">{{buttonLabels.prev}}</button>
</div>
<div class="tr-nav__col">
{{__ "Page"}} <span class="js-current-page">{{../currentPage}}</span> / {{../pagesNum}}
{{__ "Page"}} <span class="js-current-page">{{currentPage}}</span> / {{pagesNum}}
</div>
<div class="tr-nav__col js-next-page">
<button class="btn-info small">{{../buttonLabels.next}}</button>
<button class="btn-info small">{{buttonLabels.next}}</button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/js/pciCreator/ims/textReaderInteraction/imsPciCreator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"typeIdentifier": "textReaderInteraction",
"label": "Text reader",
"description": "The Paging widget combines a scrolling widget with additional paging controls.",
"version": "1.1.1",
"version": "2.0.0",
"author": "Aleh Hutnikau",
"email": "contact@taotesting.com",
"tags": [
Expand Down
Loading
Loading