Merge pull request #329 from HapticX/dev

release v4.4.4

happyx.nimble

@@ -2,7 +2,7 @@
 
 description = "Macro-oriented asynchronous web-framework written with ♥"
 author = "HapticX"
-version = "4.4.3"
+version = "4.4.4"
 license = "MIT"
 srcDir = "src"
 installExt = @["nim"]

src/happyx/core/constants.nim

@@ -99,7 +99,7 @@ const
   # Framework version
   HpxMajor* = 4
   HpxMinor* = 4
-  HpxPatch* = 3
+  HpxPatch* = 4
   HpxVersion* = $HpxMajor & "." & $HpxMinor & "." & $HpxPatch
 
 

src/happyx/spa/renderer.nim

@@ -411,10 +411,11 @@ template start*(app: App) =
             echo "route from ", currentRoute, " to ", r
             route(r)
       window.addEventListener("hashchange", onHashChangeCallback)
-    if window.location.hash.len == 0:
-      route("/")
-    else:
-      {.emit : "if(window.location.hash[0]=='#'){`route`(window.location.hash.substr(1));}else{`route`(window.location.hash);}".}
+    when not defined(disableAutoMove):
+      if window.location.hash.len == 0:
+        route("/")
+      else:
+        {.emit : "if(window.location.hash[0]=='#'){`route`(window.location.hash.substr(1));}else{`route`(window.location.hash);}".}
 
 
 macro buildHtml*(root, html: untyped): untyped =

src/happyx/ssr/cors.nim

@@ -152,13 +152,22 @@ else:
       if cors.allowMethods.len > 0:
         `headers`["Access-Control-Allow-Methods"] = cors.allowMethods
       if cors.allowOrigins.len > 0:
-        for origin in cors.allowOrigins:
-          if origin == "*":
-            `headers`["Access-Control-Allow-Origin"] = `host`
-            break
-          elif origin == `host`:
-            `headers`["Access-Control-Allow-Origin"] = origin
-            break
+        if headers.hasKey("origin"):
+          for origin in cors.allowOrigins:
+            if origin == "*":
+              `headers`["Access-Control-Allow-Origin"] = headers["origin"]
+              break
+            elif origin == `host`:
+              `headers`["Access-Control-Allow-Origin"] = origin
+              break
+        else:
+          for origin in cors.allowOrigins:
+            if origin == "*":
+              `headers`["Access-Control-Allow-Origin"] = `host`
+              break
+            elif origin == `host`:
+              `headers`["Access-Control-Allow-Origin"] = origin
+              break
         if not `headers`.hasKey("Access-Control-Allow-Origin"):
           `headers`["Access-Control-Allow-Origin"] = cors.allowOrigins[0]