changeset 14:5fd2a35d65c0

Слияние
author cin
date Fri, 08 Sep 2017 13:45:10 +0300
parents 3d4abbce4afc (current diff) 23be39fd3851 (diff)
children b85df31b7e0e
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/djol/WFSSource.js	Fri Sep 08 13:44:45 2017 +0300
+++ b/src/djol/WFSSource.js	Fri Sep 08 13:45:10 2017 +0300
@@ -11,9 +11,9 @@
         }
 
         safe.argumentNotNull(wfs, "wfsURL");
-        safe.argumentNotEmpty(featurePrefix, "featurePrefix");
-        safe.argumentNotEmpty(featureNS, "featureNS");
-        safe.argumentNotEmpty(featureType, "featureType");
+        safe.argumentNotEmptyString(featurePrefix, "featurePrefix");
+        safe.argumentNotEmptyString(featureNS, "featureNS");
+        safe.argumentNotEmptyString(featureType, "featureType");
 
         var format = new ol.format.WFS({
             featureNS : featureNS,
--- a/src/implab/text/template-compile.js	Fri Sep 08 13:44:45 2017 +0300
+++ b/src/implab/text/template-compile.js	Fri Sep 08 13:45:10 2017 +0300
@@ -2,7 +2,7 @@
     [ "dojo/request", "./format" ],
     function(request, format) {
         var compile = function(str) {
-            var code = "var p=[],print=function(){p.push(foramt.apply(null,arguments));};" +
+            var code = "var p=[],print=function(){p.push(format.apply(null,arguments));};" +
                 // Introduce the data as local variables using with(){}
                 "with(obj){p.push('" +
                 // Convert the template into pure JavaScript