From 3925aed5eaad0a37ec6a8614ba391b6703c45d39 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Thu, 28 Aug 2014 11:12:21 +0300 Subject: [PATCH] HTML: Changing the files extensions to js These are actually javascript files containing js objects and not json files. Signed-off-by: Gehad elrobey Signed-off-by: Dirk Hohndel --- qt-ui/divelogexportdialog.cpp | 8 ++++---- theme/dive_export.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index 99669d6d4..67803eeee 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -93,10 +93,10 @@ void DiveLogExportDialog::exportHtmlInit(const QString &filename) mainDir.mkdir(file.fileName() + "_files"); QString exportFiles = file.fileName() + "_files"; - QString json_dive_data = exportFiles + QDir::separator() + "file.json"; - QString json_settings = exportFiles + QDir::separator() + "settings.json"; - QString translation = exportFiles + QDir::separator() + "translation.json"; - QString stat_file = exportFiles + QDir::separator() + "stat.json"; + QString json_dive_data = exportFiles + QDir::separator() + "file.js"; + QString json_settings = exportFiles + QDir::separator() + "settings.js"; + QString translation = exportFiles + QDir::separator() + "translation.js"; + QString stat_file = exportFiles + QDir::separator() + "stat.js"; QString photos_directory = exportFiles + QDir::separator() + "photos" + QDir::separator(); mainDir.mkdir(photos_directory); exportFiles += "/"; diff --git a/theme/dive_export.html b/theme/dive_export.html index 697c16ca3..4073d0639 100644 --- a/theme/dive_export.html +++ b/theme/dive_export.html @@ -31,19 +31,19 @@ function load_scripts() document.getElementsByTagName("head")[0].appendChild(fileref); fileref=document.createElement('script'); - fileref.setAttribute("src", location.pathname + "_files/file.json"); + fileref.setAttribute("src", location.pathname + "_files/file.js"); document.getElementsByTagName("head")[0].appendChild(fileref); fileref=document.createElement('script'); - fileref.setAttribute("src", location.pathname + "_files/stat.json"); + fileref.setAttribute("src", location.pathname + "_files/stat.js"); document.getElementsByTagName("head")[0].appendChild(fileref); fileref=document.createElement('script'); - fileref.setAttribute("src", location.pathname + "_files/translation.json"); + fileref.setAttribute("src", location.pathname + "_files/translation.js"); document.getElementsByTagName("head")[0].appendChild(fileref); fileref=document.createElement('script'); - fileref.setAttribute("src", location.pathname + "_files/settings.json"); + fileref.setAttribute("src", location.pathname + "_files/settings.js"); document.getElementsByTagName("head")[0].appendChild(fileref); load_script_sync("list_lib.js");