Skip to content

Commit

Permalink
Move latest JS files into TS
Browse files Browse the repository at this point in the history
  • Loading branch information
@cracrayol
cracrayol committed Nov 6, 2019
1 parent 4d15ca6 commit 4b05bff
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 159 deletions.
0 src/www/js/common.js → src/ts/common.ts
View file
File renamed without changes.
0 src/www/js/cordova-stuff/cordovaApp.js → src/ts/cordova-stuff/cordovaApp.ts
View file
File renamed without changes.
11 changes: 8 additions & 3 deletions src/ts/external.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ interface JQuery {
initializeValue(): void;
}

declare var cordovaApp:any;
declare var routing:any;
interface Navigator {
connection: any;
app: any;
}

// index.html:
declare const ENVIRONMENT : string;
Expand All @@ -35,6 +37,7 @@ declare var ga;
declare function validateXML(parms : any) : string;

// Cordova
declare const Connection: any;
declare const LocalFileSystem;
declare const FileTransfer;

Expand Down Expand Up @@ -62,8 +65,10 @@ interface String {
endsWith(suffix : string);
isValidFileName() : boolean;
startsWith( text : string ) : boolean;
escapeRegExp() : string;
unescapeHtml() : string;
getUrlParameter(sParam: string) : string;
}
declare function ajaxErrorMsg(context : any, jqXHR : any, textStatus : string, errorThrown : string);

// Mixed:
interface Window {
Expand Down
4 changes: 2 additions & 2 deletions src/www/js/routing.js → src/ts/routing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* The routes handler.
* As this is a single page app, routes are implemented with the URL hash
*/
var routing = {
const routing = {

/**
* The current controller name
Expand All @@ -16,7 +16,7 @@ var routing = {
* @param {object} parameters Hash with parameters for the route. It can be null
* @returns True if the redirection can be done. False otherwise
*/
redirect: function(route, parameters) {
redirect: function(route, parameters: any = null) {
try {

// Remove hash
Expand Down
130 changes: 65 additions & 65 deletions src/www/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,87 +241,87 @@ <h4 class="modal-title" id="template-randomtitle" data-translation="randomTable"
<!-- Base -->
<script src="js/common.js"></script>
<script src="js/views.js"></script>
<script src="js/ts-generated/state.js"></script>
<script src="js/state.js"></script>
<script src="js/routing.js"></script>

<!-- Base (cordova stuff) -->
<script src="js/cordova-stuff/cordovaApp.js"></script>
<script src="js/ts-generated/cordova-stuff/cordovaFS.js"></script>
<script src="js/ts-generated/cordova-stuff/savedGamesExport.js"></script>
<script src="js/ts-generated/cordova-stuff/documentSelection.js"></script>
<script src="js/cordova-stuff/cordovaFS.js"></script>
<script src="js/cordova-stuff/savedGamesExport.js"></script>
<script src="js/cordova-stuff/documentSelection.js"></script>

<!-- Model -->
<script src="js/ts-generated/model/book.js"></script>
<script src="js/ts-generated/model/section.js"></script>
<script src="js/ts-generated/model/sectionRenderer.js"></script>
<script src="js/ts-generated/model/actionChart.js"></script>
<script src="js/ts-generated/model/mechanics.js"></script>
<script src="js/ts-generated/model/randomTable.js"></script>
<script src="js/ts-generated/model/combatTable.js"></script>
<script src="js/ts-generated/model/combat.js"></script>
<script src="js/ts-generated/model/combatTurn.js"></script>
<script src="js/ts-generated/model/sectionState.js"></script>
<script src="js/ts-generated/model/bookSectionStates.js"></script>
<script src="js/ts-generated/model/item.js"></script>
<script src="js/ts-generated/model/projectAon.js"></script>
<script src="js/ts-generated/model/bookDownloadState.js"></script>
<script src="js/ts-generated/model/localBooksLibrary.js"></script>
<script src="js/ts-generated/model/loreCircle.js"></script>
<script src="js/ts-generated/model/bookValidator.js"></script>
<script src="js/ts-generated/model/expressionEvaluator.js"></script>
<script src="js/ts-generated/model/inventoryState.js"></script>
<script src="js/ts-generated/model/currency.js"></script>
<script src="js/ts-generated/model/googleAnalytics.js"></script>
<script src="js/model/book.js"></script>
<script src="js/model/section.js"></script>
<script src="js/model/sectionRenderer.js"></script>
<script src="js/model/actionChart.js"></script>
<script src="js/model/mechanics.js"></script>
<script src="js/model/randomTable.js"></script>
<script src="js/model/combatTable.js"></script>
<script src="js/model/combat.js"></script>
<script src="js/model/combatTurn.js"></script>
<script src="js/model/sectionState.js"></script>
<script src="js/model/bookSectionStates.js"></script>
<script src="js/model/item.js"></script>
<script src="js/model/projectAon.js"></script>
<script src="js/model/bookDownloadState.js"></script>
<script src="js/model/localBooksLibrary.js"></script>
<script src="js/model/loreCircle.js"></script>
<script src="js/model/bookValidator.js"></script>
<script src="js/model/expressionEvaluator.js"></script>
<script src="js/model/inventoryState.js"></script>
<script src="js/model/currency.js"></script>
<script src="js/model/googleAnalytics.js"></script>

<!-- Controllers -->
<script src="js/ts-generated/controller/setupController.js"></script>
<script src="js/ts-generated/controller/gameController.js"></script>
<script src="js/ts-generated/controller/actionChartController.js"></script>
<script src="js/ts-generated/controller/mapController.js"></script>
<script src="js/ts-generated/controller/settingsController.js"></script>
<script src="js/ts-generated/controller/testsController.js"></script>
<script src="js/ts-generated/controller/mainMenuController.js"></script>
<script src="js/ts-generated/controller/newGameController.js"></script>
<script src="js/ts-generated/controller/aboutController.js"></script>
<script src="js/ts-generated/controller/loadGameController.js"></script>
<script src="js/ts-generated/controller/projectAonLicenseController.js"></script>
<script src="js/ts-generated/controller/gameRulesController.js"></script>
<script src="js/ts-generated/controller/workWithBooks.js"></script>
<script src="js/ts-generated/controller/kaimonasteryController.js"></script>
<script src="js/ts-generated/controller/faqController.js"></script>
<script src="js/ts-generated/controller/privacyController.js"></script>
<script src="js/controller/setupController.js"></script>
<script src="js/controller/gameController.js"></script>
<script src="js/controller/actionChartController.js"></script>
<script src="js/controller/mapController.js"></script>
<script src="js/controller/settingsController.js"></script>
<script src="js/controller/testsController.js"></script>
<script src="js/controller/mainMenuController.js"></script>
<script src="js/controller/newGameController.js"></script>
<script src="js/controller/aboutController.js"></script>
<script src="js/controller/loadGameController.js"></script>
<script src="js/controller/projectAonLicenseController.js"></script>
<script src="js/controller/gameRulesController.js"></script>
<script src="js/controller/workWithBooks.js"></script>
<script src="js/controller/kaimonasteryController.js"></script>
<script src="js/controller/faqController.js"></script>
<script src="js/controller/privacyController.js"></script>

<!-- Mechanics -->
<script src="js/ts-generated/controller/mechanics/mechanicsEngine.js"></script>
<script src="js/ts-generated/controller/mechanics/mealMechanics.js"></script>
<script src="js/ts-generated/controller/mechanics/combatMechanics.js"></script>
<script src="js/ts-generated/controller/mechanics/randomMechanics.js"></script>
<script src="js/ts-generated/controller/mechanics/skillsSetup.js"></script>
<script src="js/ts-generated/controller/mechanics/specialSectionsMechanics.js"></script>
<script src="js/ts-generated/controller/mechanics/numberPickerMechanics.js"></script>
<script src="js/ts-generated/controller/mechanics/setupDisciplines.js"></script>
<script src="js/ts-generated/controller/mechanics/equipmentSectionMechanics.js"></script>
<script src="js/controller/mechanics/mechanicsEngine.js"></script>
<script src="js/controller/mechanics/mealMechanics.js"></script>
<script src="js/controller/mechanics/combatMechanics.js"></script>
<script src="js/controller/mechanics/randomMechanics.js"></script>
<script src="js/controller/mechanics/skillsSetup.js"></script>
<script src="js/controller/mechanics/specialSectionsMechanics.js"></script>
<script src="js/controller/mechanics/numberPickerMechanics.js"></script>
<script src="js/controller/mechanics/setupDisciplines.js"></script>
<script src="js/controller/mechanics/equipmentSectionMechanics.js"></script>

<!-- UI utilities -->
<script src="js/ts-generated/views/viewsUtils/numberPicker.js"></script>
<script src="js/ts-generated/views/viewsUtils/translations.js"></script>
<script src="js/ts-generated/views/viewsUtils/objectsTable.js"></script>
<script src="js/ts-generated/views/viewsUtils/moneyDialog.js"></script>
<script src="js/ts-generated/views/viewsUtils/cookie.js"></script>
<script src="js/views/viewsUtils/numberPicker.js"></script>
<script src="js/views/viewsUtils/translations.js"></script>
<script src="js/views/viewsUtils/objectsTable.js"></script>
<script src="js/views/viewsUtils/moneyDialog.js"></script>
<script src="js/views/viewsUtils/cookie.js"></script>

<!-- Views -->
<script src="js/ts-generated/views/actionChartView.js"></script>
<script src="js/ts-generated/views/gameView.js"></script>
<script src="js/ts-generated/views/setupView.js"></script>
<script src="js/ts-generated/views/mapView.js"></script>
<script src="js/ts-generated/views/settingsView.js"></script>
<script src="js/ts-generated/views/mainMenuView.js"></script>
<script src="js/ts-generated/views/newGameView.js"></script>
<script src="js/ts-generated/views/loadGameView.js"></script>
<script src="js/ts-generated/views/workWithBooksView.js"></script>
<script src="js/views/actionChartView.js"></script>
<script src="js/views/gameView.js"></script>
<script src="js/views/setupView.js"></script>
<script src="js/views/mapView.js"></script>
<script src="js/views/settingsView.js"></script>
<script src="js/views/mainMenuView.js"></script>
<script src="js/views/newGameView.js"></script>
<script src="js/views/loadGameView.js"></script>
<script src="js/views/workWithBooksView.js"></script>

<!-- This HTML page template handler -->
<script src="js/ts-generated/template.js"></script>
<script src="js/template.js"></script>

<!-- @endif -->

Expand Down
88 changes: 0 additions & 88 deletions src/www/js/views.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"outDir" : "src/www/js/ts-generated",
"outDir" : "src/www/js",
"rootDir" : "src/ts",
"target": "es5"
},
Expand Down

0 comments on commit 4b05bff

Please sign in to comment.