Move Javascript files related to 2d canvas rendering to separate dire…

…ctory.
EmilyAmakul · Oct 22, 2016 · 4c62202 · 4c62202
1 parent 713a81f
commit 4c62202
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 5 deletions.
diff --git a/freeciv-web/pom.xml b/freeciv-web/pom.xml
@@ -140,6 +140,7 @@
                             <jsSourceIncludes>
                                 <jsSourceInclude>*.js</jsSourceInclude>
                                 <jsSourceInclude>libs/*.js</jsSourceInclude>
+                                <jsSourceInclude>2dcanvas/*.js</jsSourceInclude>
                             </jsSourceIncludes>
                             <jsSourceExcludes>
                                 <jsSourceExclude>frontpage.js</jsSourceExclude>

diff --git a/freeciv-web/src/main/webapp/index.html b/freeciv-web/src/main/webapp/index.html
@@ -5,11 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="author" content="The Freeciv project">
-    <meta name="description" content="Freeciv is a Free and Open Source empire-building strategy game made with HTML5 which you can play in your browser, tablet or mobile device!">
+    <meta name="description" content="Play the Strategy Game of Freeciv online in your HTML5 browser, mobile or tablet for free here!">
     <meta name="google-site-verification" content="Dz5U0ImteDS6QJqksSs6Nq7opQXZaHLntcSUkshCF8I" />
     <meta property="og:image" content="/images/freeciv-fp-logo-2.png" />
 
-    <title>Freeciv-web - free empire-building strategy game playable online in web browser</title>
+    <title>Freeciv-web online browser HTML5 version</title>
 
     <link rel="shortcut icon" href="images/freeciv-shortcut-icon.png">
     <link rel="apple-touch-icon" href="images/freeciv-splash2.png" />

diff --git a/...b/src/main/webapp/javascript/globeview.js → ...n/webapp/javascript/2dcanvas/globeview.js b/...b/src/main/webapp/javascript/globeview.js → ...n/webapp/javascript/2dcanvas/globeview.js
diff --git a/...web/src/main/webapp/javascript/mapctrl.js → ...ain/webapp/javascript/2dcanvas/mapctrl.js b/...web/src/main/webapp/javascript/mapctrl.js → ...ain/webapp/javascript/2dcanvas/mapctrl.js
diff --git a/...web/src/main/webapp/javascript/mapview.js → ...ain/webapp/javascript/2dcanvas/mapview.js b/...web/src/main/webapp/javascript/mapview.js → ...ain/webapp/javascript/2dcanvas/mapview.js
@@ -57,15 +57,15 @@ function init_mapview()
 
   /* Loads the two tileset definition files */
   $.ajax({
-    url: "/javascript/tileset_config_amplio2.js",
+    url: "/javascript/2dcanvas/tileset_config_amplio2.js",
     dataType: "script",
     async: false
   }).fail(function() {
     console.error("Unable to load tileset config.");
   });
 
   $.ajax({
-    url: "/javascript/tileset_spec_amplio2.js",
+    url: "/javascript/2dcanvas/tileset_spec_amplio2.js",
     dataType: "script",
     async: false
   }).fail(function() {

diff --git a/.../main/webapp/javascript/mapview_common.js → ...app/javascript/2dcanvas/mapview_common.js b/.../main/webapp/javascript/mapview_common.js → ...app/javascript/2dcanvas/mapview_common.js
diff --git a/...bapp/javascript/tileset_config_amplio2.js → ...script/2dcanvas/tileset_config_amplio2.js b/...bapp/javascript/tileset_config_amplio2.js → ...script/2dcanvas/tileset_config_amplio2.js
diff --git a/...eb/src/main/webapp/javascript/tilespec.js → ...in/webapp/javascript/2dcanvas/tilespec.js b/...eb/src/main/webapp/javascript/tilespec.js → ...in/webapp/javascript/2dcanvas/tilespec.js
diff --git a/scripts/freeciv-img-extract/sync.sh b/scripts/freeciv-img-extract/sync.sh
@@ -11,7 +11,7 @@ pngcrush pre-freeciv-web-tileset-isotrident-0.png freeciv-web-tileset-isotrident
 pngcrush pre-freeciv-web-tileset-isotrident-1.png freeciv-web-tileset-isotrident-1.png &&
 mkdir -p ../../freeciv-web/src/main/webapp/tileset &&
 cp freeciv-web-tileset-*.png ../../freeciv-web/src/main/webapp/tileset/ &&
-cp tileset_spec_*.js ../../freeciv-web/src/main/webapp/javascript/ && 
+cp tileset_spec_*.js ../../freeciv-web/src/main/webapp/javascript/2dcanvas/ && 
 echo "converting flag svg files to png..." && 
 mkdir -p ../../freeciv-web/src/main/webapp/images/flags/ &&
 (for X in `find ../../freeciv/freeciv/data/flags/*.svg`