Favicon bug fix and updated phonegap version

michaelsboost · Oct 19, 2019 · e85efc4 · e85efc4
1 parent d698c9d
commit e85efc4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ For command line use you can use [nativefier](https://github.com/jiahaog/nativef
 
 Want to contribute? Great!  
 
-*As of April 13th 2018 WebDGap is no longer an active project.  
+*As of October 19th 2019 WebDGap is no longer an active project.  
 All updates as of that date and on are solely contributor based implementations.*
 
 You can submit a pull request or simply share the project :)

diff --git a/app/index.html b/app/index.html
@@ -334,7 +334,7 @@ <h1 class="headline-primary--grouped note export4text" data-language="dzipnote">
         </div>
 
         <div class="discontinued" data-language="discontinued">
-          <em>As of April 13th, 2018 WebDGap is no longer an active project.<br>
+          <em>As of October 19th, 2019 WebDGap is no longer an active project.<br>
           All updates as of that date and on are solely contributor based implementations.</em>
         </div>
       </div>

diff --git a/js/webdgap.js b/js/webdgap.js
@@ -538,6 +538,7 @@ var audioCapture, videoCapture, storagePerm, setOffline, listPermissions,
               zip.file("resources/default_app/css/style.css", "html, body {\n  height: 100%;\n  padding: 0;\n  margin: 0;\n  overflow: hidden;\n}\n\niframe {\n  width: 100%;\n  height: 100%;\n  border: 0;\n}");
               zip.file("resources/default_app/index.html", "<!DOCTYPE html>\n<html>\n  <head>\n    <title>"+ $("[data-id=sitename]").val() +"</title>\n    <meta charset=\"utf-8\">\n    <meta name=\"viewport\" content=\"initial-scale=1.0\">\n    <meta http-equiv=\"X-UA-Compatible\" content=\"IE=9\" />\n    <link type=\"text/css\" rel=\"stylesheet\" href=\"css/style.css\" />\n  </head>\n  <body>\n    <iframe src=\""+ $("[data-action=website]").val() +"\">\n      Your browser does not support the iFrame html elements.\n    </iframe>\n  </body>\n</html>");
               zip.file("resources/default_app/package.json", "{\n  \"name\": \""+ $("[data-id=sitename]").val() +"\",\n  \"productName\": \""+ $("[data-id=sitename]").val() +"\",\n  \"version\": \"1.0.0\",\n  \"main\": \"default_app.js\",\n  \"license\": \"MIT\"\n}\n");
+              // zip.file("package.json", '{\n  "main"  : "resources/default_app/index.html",\n  "name"  : "'+ $("[data-id=sitename]").val() +'",\n  "window": {\n      "toolbar" : false,\n      "icon"    : "resources/default_app/icons/128.png",\n      "width"   : 1000,\n      "height"  : 600,\n      "position": "center"\n  }\n}');
               // Export application
               var content = zip.generate({type:"blob"});
               saveAs(content, $("[data-id=sitename]").val().replace(/ /g, "-").toLowerCase() + "-winsite.zip");
@@ -788,6 +789,7 @@ function displayPreview(file) {
     var webdgaporigimg = document.createElement("img");
     webdgaporigimg.setAttribute("data-webdgapimgload", "webdgapimg");
     webdgaporigimg.src = e.target.result;
+    webdgaporigimg.id = "webdgaporigimg";
     webdgapContainer.appendChild(webdgaporigimg);
 
     // Load image sizes  
@@ -1406,13 +1408,13 @@ $(document).ready(function() {
                   listIntentions = telIntent + smsIntent + mailtoIntent + geoIntent + marketIntent;
 
                   if (filestorage.checked) {
-                    filestorageIntent = "\n\n  <gap:plugin name=\"org.apache.cordova.file\"/>\n  <gap:plugin name=\"org.apache.cordova.file-transfer\"/>\n  <preference name=\"AndroidPersistentFileLocation\" value=\"Compatibility\" />";
+                    filestorageIntent = "\n\n  <gap:plugin name=\"cordova-plugin-file\" source=\"npm\" spec=\"~4.1.1\" />\n  <gap:plugin name=\"cordova-plugin-file-transfer\" source=\"npm\" spec=\"~1.5.0\" />\n  <preference name=\"AndroidPersistentFileLocation\" value=\"Compatibility\" />";
                   } else {
                     filestorageIntent = "";
                   }
 
                   // Files for exported app
-                  zip.file("config.xml", "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<widget xmlns = \"http://www.w3.org/ns/widgets\"\n  xmlns:gap   = \"http://phonegap.com/ns/1.0\"\n  id          = \"com.webdgap."+ document.querySelector("[data-id=sitename]").value.replace(/ /g, '').toLowerCase() +"\"\n  version     = \""+ $("[data-pgb=version]").val() +"\"\n  versionCode = \""+ $("[data-pgb=versionCode]").val() +"\">\n  <name>"+ $("[data-id=sitename]").val() +"</name>\n  <description>\n    "+ $("[data-pgb=description]").val() +"\n  </description>\n  <author email=\""+ $("[data-pgb=authoremail]").val() +"\" href=\""+ $("[data-pgb=authorlink]").val() +"\">\n    "+ $("[data-pgb=author]").val() +"\n  </author>\n\n  <content src=\"index.html\" />\n\n  <icon src=\"logo.png\" gap:role=\"default\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"ldpi\" src=\"res/icon/android/icon-36-ldpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"mdpi\" src=\"res/icon/android/icon-48-mdpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"hdpi\" src=\"res/icon/android/icon-72-hdpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"xhdpi\" src=\"res/icon/android/icon-96-xhdpi.png\" />\n  <icon gap:platform=\"android\" src=\"res/icon/android/icon-96-xhdpi.png\" />\n  <icon gap:platform=\"blackberry\" src=\"res/icon/blackberry/icon-80.png\" />\n  <icon gap:platform=\"blackberry\" gap:state=\"hover\" src=\"res/icon/blackberry/icon-80.png\" />\n  <icon gap:platform=\"ios\" height=\"57\" src=\"res/icon/ios/icon-57.png\" width=\"57\" />\n  <icon gap:platform=\"ios\" height=\"72\" src=\"res/icon/ios/icon-72.png\" width=\"72\" />\n  <icon gap:platform=\"ios\" height=\"114\" src=\"res/icon/ios/icon-57-2x.png\" width=\"114\" />\n  <icon gap:platform=\"ios\" height=\"144\" src=\"res/icon/ios/icon-72-2x.png\" width=\"144\" />\n  <icon gap:platform=\"webos\" src=\"res/icon/webos/icon-64.png\" />\n  <icon gap:platform=\"wp8\" src=\"www/res/icon/wp8/ApplicationIcon.png\" />\n  <icon gap:platform=\"wp8\" src=\"www/res/icon/wp8/Background.png\" />\n\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square150x150Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square30x30Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/StoreLogo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/StoreLogo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square44x44Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square44x44Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square70x70Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square71x71Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square71x71Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square150x150Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square310x310Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Wide310x150Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Wide310x150Logo.scale-240.png\" />\n\n  <preference name=\"permissions\" value=\"none\"/>\n  <preference name=\"orientation\" value=\"default\"/>\n  <preference name=\"target-device\" value=\"universal\"/>\n  <preference name=\"webviewbounce\" value=\"false\"/>\n  <preference name=\"prerendered-icon\" value=\"true\"/>\n  <preference name=\"stay-in-webview\" value=\"false\"/>\n  <preference name=\"ios-statusbarstyle\" value=\"black-opaque\"/>\n\n  <gap:plugin name=\"cordova-plugin-inappbrowser\" source=\"npm\"/>\n  <gap:plugin name=\"cordova-plugin-network-information\" source=\"npm\"/>\n\n  <access origin=\"*\"/>\n  <gap:plugin name=\"cordova-plugin-whitelist\" source=\"npm\"/>\n\n  <preference name=\"phonegap-version\" value=\"cli-7.0.1\" />\n  <preference name=\"android-minSdkVersion\" value=\"14\" />\n  <preference name=\"android-targetSdkVersion\" value=\"19\" />"+ filestorageIntent +"\n\n  <allow-intent href=\"http://*/*\"/>\n  <allow-intent href=\"https://*/*\"/>\n  <allow-intent href=\"tel:*\"/>\n  <allow-intent href=\"sms:*\"/>\n  <allow-intent href=\"mailto:*\"/>\n  <allow-intent href=\"geo:*\"/>"+ listIntentions +"\n</widget>");
+                  zip.file("config.xml", "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<widget xmlns = \"http://www.w3.org/ns/widgets\"\n  xmlns:gap   = \"http://phonegap.com/ns/1.0\"\n  id          = \"com.webdgap."+ document.querySelector("[data-id=sitename]").value.replace(/ /g, '').toLowerCase() +"\"\n  version     = \""+ $("[data-pgb=version]").val() +"\"\n  versionCode = \""+ $("[data-pgb=versionCode]").val() +"\">\n  <name>"+ $("[data-id=sitename]").val() +"</name>\n  <description>\n    "+ $("[data-pgb=description]").val() +"\n  </description>\n  <author email=\""+ $("[data-pgb=authoremail]").val() +"\" href=\""+ $("[data-pgb=authorlink]").val() +"\">\n    "+ $("[data-pgb=author]").val() +"\n  </author>\n\n  <content src=\"index.html\" />\n\n  <icon src=\"logo.png\" gap:role=\"default\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"ldpi\" src=\"res/icon/android/icon-36-ldpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"mdpi\" src=\"res/icon/android/icon-48-mdpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"hdpi\" src=\"res/icon/android/icon-72-hdpi.png\" />\n  <icon gap:platform=\"android\" gap:qualifier=\"xhdpi\" src=\"res/icon/android/icon-96-xhdpi.png\" />\n  <icon gap:platform=\"android\" src=\"res/icon/android/icon-96-xhdpi.png\" />\n  <icon gap:platform=\"blackberry\" src=\"res/icon/blackberry/icon-80.png\" />\n  <icon gap:platform=\"blackberry\" gap:state=\"hover\" src=\"res/icon/blackberry/icon-80.png\" />\n  <icon gap:platform=\"ios\" height=\"57\" src=\"res/icon/ios/icon-57.png\" width=\"57\" />\n  <icon gap:platform=\"ios\" height=\"72\" src=\"res/icon/ios/icon-72.png\" width=\"72\" />\n  <icon gap:platform=\"ios\" height=\"114\" src=\"res/icon/ios/icon-57-2x.png\" width=\"114\" />\n  <icon gap:platform=\"ios\" height=\"144\" src=\"res/icon/ios/icon-72-2x.png\" width=\"144\" />\n  <icon gap:platform=\"webos\" src=\"res/icon/webos/icon-64.png\" />\n  <icon gap:platform=\"wp8\" src=\"www/res/icon/wp8/ApplicationIcon.png\" />\n  <icon gap:platform=\"wp8\" src=\"www/res/icon/wp8/Background.png\" />\n\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square150x150Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square30x30Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/StoreLogo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/StoreLogo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square44x44Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square44x44Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square70x70Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square71x71Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square71x71Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square150x150Logo.scale-240.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Square310x310Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Wide310x150Logo.scale-100.png\" />\n  <icon gap:platform=\"windows\" src=\"www/res/icon/windows/Wide310x150Logo.scale-240.png\" />\n\n  <preference name=\"permissions\" value=\"none\"/>\n  <preference name=\"orientation\" value=\"default\"/>\n  <preference name=\"target-device\" value=\"universal\"/>\n  <preference name=\"webviewbounce\" value=\"false\"/>\n  <preference name=\"prerendered-icon\" value=\"true\"/>\n  <preference name=\"stay-in-webview\" value=\"false\"/>\n  <preference name=\"ios-statusbarstyle\" value=\"black-opaque\"/>\n\n  <gap:plugin name=\"cordova-plugin-inappbrowser\" source=\"npm\" spec=\"~1.3.0\"/>\n  <gap:plugin name=\"cordova-plugin-network-information\" source=\"npm\" spec=\"~1.2.0\"/>\n\n  <access origin=\"*\"/>\n  <gap:plugin name=\"cordova-plugin-whitelist\" source=\"npm\"/>\n\n  <preference name=\"phonegap-version\" value=\"cli-9.0.0\" />\n  <preference name=\"android-minSdkVersion\" value=\"19\" />\n  <preference name=\"android-targetSdkVersion\" value=\"28\" />"+ filestorageIntent +"\n\n  <allow-intent href=\"http://*/*\"/>\n  <allow-intent href=\"https://*/*\"/>\n  <allow-intent href=\"tel:*\"/>\n  <allow-intent href=\"sms:*\"/>\n  <allow-intent href=\"mailto:*\"/>\n  <allow-intent href=\"geo:*\"/>"+ listIntentions +"\n</widget>");
                   zip.file("README.md", "# Thank you for using WebDGap!\n\nIntro to your PhoneGap Build Export\n-------------\n\n### File Structure\n\n**NOTICE:** This export is just a template. Structure it however you like for PhoneGap Build!\n\n - www\n  - (your application source code)\n - res/icon\n   - (your logo is located here for windows phone, ios, and android)\n - logo.png\n - config.xml\n\n**DON'T FORGET** to add `<script src=\"cordova.js\"></script>` or `<script src=\"phonegap.js\"></script>` into your `index.html` file  (which should be located in the `www` directory)\n\nDonate To The Project!\n-------------\n\nIf WebDGap was at all helpful for you. [Would you consider donating to the project?](https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=JryIEtO_GiYnqlvRfV6BGnO6bAxR3JtIQif2j1z1eFYuoLkYf_XZOY6QbWe&dispatch=5885d80a13c0db1f8e263663d3faee8dcce3e160f5b9538489e17951d2c62172)");
 
                   // Export Chrome Application