Merge branch 'development' of https://github.com/jaydata/jaydata into development

Author: borzav

gulpfile.js

@@ -23,6 +23,7 @@ var exec = require('child_process').exec;
 var eslint = require('gulp-eslint');
 var header = require('gulp-header');
 var footer = require('gulp-footer');
+var pkg = require('./package.json');
 
 config.options = minimist(process.argv.slice(2), config.buildDefaultOptions);
 var paths = {
@@ -181,11 +182,11 @@ function gulpTask(td, config){
     }
 
     if (td.header){
-        task = task.pipe(header(fs.readFileSync(td.header, 'utf8')));
+        task = task.pipe(header(fs.readFileSync(td.header, 'utf8'), { pkg: pkg }));
     }
 
     if (td.footer){
-        task = task.pipe(footer(fs.readFileSync(td.footer, 'utf8')));
+        task = task.pipe(footer(fs.readFileSync(td.footer, 'utf8'), { pkg: pkg }));
     }
 
     task = task.pipe(gulp.dest(td.destFolder));

src/TypeSystem/initializeJayData.js

@@ -20,8 +20,8 @@ if (!console.error) console.error = function() {};
   /// Collection of JayData services
   ///</summary>
   $data.__namespace = true;
-  $data.version = "JayData 1.2.0";
-  $data.versionNumber = "1.2.0";
+  // $data.version = "JayData 1.2.0";
+  // $data.versionNumber = "1.2.0";
   $data.root = {};
   $data.Acorn = acorn;
   //$data.Acorn = $data.Acorn || (typeof acorn == 'object' ? acorn : undefined);

src/jaydata-footer.js

@@ -1,3 +1,7 @@
+	var $data = require('jaydata/core');
+	$data.version = 'JayData <%=pkg.version %>';
+	$data.versionNumber = '<%=pkg.version %>';
+
 	if (typeof window !== "undefined"){
 		window.require = require;
 	}