Merge pull request #146 from yellowtree/autosave

Implement AJAX Override Autosave (Ref #94 #140)

.gitignore

@@ -13,6 +13,7 @@ wp-cli.local.yml
 /.vscode
 *.code
 /coverage
+/.parcel-cache
 
 /lib/vendor
 

.travis.yml

@@ -51,4 +51,5 @@ install:
 
 script:
   - composer test
-  - yarn test
+  - yarn test
+  - yarn build

ajax.php

@@ -115,34 +115,13 @@ function _geoip_detect2_enqueue_javascript() {
 	return true;
 }
 
-function _geoip_detect_parcel_get_dist_js($handle) {
-	$urlFile = GEOIP_PLUGIN_DIR . '/js/dist/parcel.json';
-	if (!is_readable($urlFile)) return false;
-
-	$json = file_get_contents($urlFile);
-	$urls = json_decode($json, true);
-
-	if (isset($urls[$handle]))
-		return '/js/dist/' .$urls[$handle];
-	return false;
-}
-
 function _geoip_detect_register_javascript() {
 	// What about CORS usage?
 	// if (!get_option('geoip-detect-ajax_enabled')) {
 	// 	return;
 	// }
 
-	$file_uri = _geoip_detect_parcel_get_dist_js('frontendJS');
-	if (!$file_uri) {
-		if (WP_DEBUG) {
-			trigger_error('Warning by the geoip-detect-Plugin: the file frontend.js could not be found, JS API will not work.', E_USER_NOTICE);
-			die();
-		}
-		return;
-	}
-
-	wp_register_script('geoip-detect-js', GEOIP_DETECT_PLUGIN_URI . $file_uri, array(), GEOIP_DETECT_VERSION, true);
+	wp_register_script('geoip-detect-js', GEOIP_DETECT_PLUGIN_URI . 'js/dist/frontend.js', array(), GEOIP_DETECT_VERSION, true);
 	$data = [
 		'ajaxurl' => admin_url('/admin-ajax.php'),
 		'default_locales' => apply_filters('geoip_detect2_locales', null),

babel.config.json

@@ -0,0 +1,9 @@
+{
+    "plugins": [
+        "transform-class-properties",
+        "@babel/plugin-transform-runtime"
+    ],
+    "presets": [
+        "@babel/preset-env"
+    ]
+}

js/body_classes.js

@@ -1,5 +1,5 @@
 import { domReady } from './lib/html';
-import { get_info } from './lookup';
+import { get_info } from './lookup/get_info';
 
 export function calc_classes(record) {
     return {
@@ -10,6 +10,11 @@ export function calc_classes(record) {
     };
 }
 
+function remove_css_classes_by_prefix(el, prefix) {
+    const classes = el.className.split(" ").filter(c => !c.startsWith(prefix));
+    el.className = classes.join(" ").trim();
+}
+
 export async function add_body_classes() {
     const record = await get_info();
 
@@ -18,11 +23,19 @@ export async function add_body_classes() {
         return;
     }
 
-    const css_classes = calc_classes(record);
-
     await domReady;
 
+    add_classes_to_body(record);
+}
+
+export function add_classes_to_body(record) {
+    const css_classes = calc_classes(record);
+
     const body = document.getElementsByTagName('body')[0];
+
+    // Remove old classes in case there are any
+    remove_css_classes_by_prefix(body, 'geoip-');
+
     for (let key of Object.keys(css_classes)) {
         const value = css_classes[key];
         if (value) {

js/body_classes.test.js

@@ -3,8 +3,9 @@
  */
 
 import { getTestRecord, getTestRecordError } from "./test-lib/test-records";
-import { calc_classes } from "./body_classes";
+import { add_classes_to_body, calc_classes } from "./body_classes";
 import Record from "./models/record";
+import { set_override_with_merge, get_info_stored_locally_record } from "./lookup/override";
 
 const emptyRecord = new Record();
 const defaultRecord = getTestRecord();
@@ -29,5 +30,20 @@ test('calc_classes', () => {
         "country-is-in-european-union": false,
         "province": "",
     });
+});
 
+test('css_classes', () => {
+    const body = document.getElementsByTagName('body')[0];
+
+    add_classes_to_body(defaultRecord);
+
+    expect(body.classList.contains('geoip-country-DE')).toBe(true);
+    expect(body.classList.contains('geoip-country-FR')).toBe(false);
+
+    set_override_with_merge('country.iso_code', 'FR');
+    let record = get_info_stored_locally_record();
+    add_classes_to_body(record); 
+
+    expect(body.classList.contains('geoip-country-FR')).toBe(true);
+    expect(body.classList.contains('geoip-country-DE')).toBe(false);
 });