jsharmony 1.30.2 → 1.31.0

package/clientjs/XExt.js

@@ -2006,17 +2006,17 @@ exports = module.exports = function(jsh){
         }
       },
       function(){
-        jsh.$dialogBlock(sel + ' input.button_ok').on('click', acceptfunc);
-        jsh.$dialogBlock(sel + ' input.button_cancel').on('click', cancelfunc);
+        jsh.$dialogBlock(sel + ' input.button_ok').on('click', function(){ acceptfunc(); });
+        jsh.$dialogBlock(sel + ' input.button_cancel').on('click', function(){ cancelfunc(); });
 
-        jsh.$dialogBlock(sel).off('acceptDialog').on('acceptDialog', acceptfunc);
-        jsh.$dialogBlock(sel).off('cancelDialog').on('cancelDialog', cancelfunc);
+        jsh.$dialogBlock(sel).off('acceptDialog').on('acceptDialog', function(){ acceptfunc(); });
+        jsh.$dialogBlock(sel).off('cancelDialog').on('cancelDialog', function(){ cancelfunc(); });
 
         jsh.$dialogBlock(sel + ' input, ' + sel + ' textarea, ' + sel + ' select').on('keydown', function (e) {
           if (options.specialKeys.escape && (e.keyCode == 27)) { e.preventDefault(); e.stopImmediatePropagation(); cancelfunc(); }
         });
         jsh.$dialogBlock(sel + ' input:not(:checkbox):not(:button)').on('keydown', function (e) {
-          if (options.specialKeys.escape && (e.keyCode == 13)) { e.preventDefault(); e.stopImmediatePropagation(); acceptfunc(); }
+          if (options.specialKeys.enter && (e.keyCode == 13)) { e.preventDefault(); e.stopImmediatePropagation(); acceptfunc(); }
         });
         if(options.backgroundClose){
           jsh.dialogBlock.on('mousedown.close' + sel, function(e){

package/jsHarmony.LoadSQL.js

@@ -156,6 +156,53 @@ exports.LoadSQLFiles = function(module, dir, options){
   return rslt;
 };
 
+exports.LoadSQLFile = function(sqlfilename, module, basepath){
+  var _this = this;
+  var sqlfiletype = 'sql';
+  if(basepath){
+    try{
+      var basepathStats = fs.lstatSync(basepath);
+      if(!basepathStats.isDirectory()) basepath = path.dirname(basepath);
+    }
+    catch(ex){
+      basepath = '';
+    }
+  }
+  if(Helper.beginsWith(sqlfilename, 'simplejson:')){
+    sqlfiletype = 'simplejson';
+    sqlfilename = sqlfilename.substr(11);
+  }
+  else if(Helper.beginsWith(sqlfilename, 'json:')){
+    sqlfiletype = 'json';
+    sqlfilename = sqlfilename.substr(5);
+  }
+  else if (sqlfilename.indexOf('.simplejson', sqlfilename.length - 11) !== -1){
+    sqlfiletype = 'simplejson';
+  }
+  else if (sqlfilename.indexOf('.json', sqlfilename.length - 5) !== -1){
+    sqlfiletype = 'json';
+  }
+
+  _this.Log.info('Loading SQL from ' + sqlfilename);
+
+  if(basepath && !path.isAbsolute(sqlfilename)) sqlfilename = path.join(basepath, sqlfilename);
+
+  if(sqlfiletype=='simplejson'){
+    try{
+      return JSON.parse(fs.readFileSync(sqlfilename, 'utf8'));
+    }
+    catch(ex){
+      throw new Error('Error parsing file "'+sqlfilename+'":' + ex.toString());
+    }
+  }
+  else if(sqlfiletype=='json'){
+    return _this.ParseJSON(sqlfilename, module && module.name, 'SQL File ' + sqlfilename, null, { fatalError: false });
+  }
+  else {
+    return fs.readFileSync(sqlfilename, 'utf8');
+  }
+};
+
 exports.LoadSQLObjects = function(dir, module, dbid, options){
   var _this = this;
   options = _.extend({ dbtype: null }, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.30.2",
+  "version": "1.31.0",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {