www/dbq/html/default.js

diff --git a/lib/php/page.php b/lib/php/page.php
index 6c7c10e922d6ea3da4252c58a5dd60582adf182e..68e75e3e6cb5c39b94e34335275effd7f210bb51 100644 (file)
--- a/lib/php/page.php
+++ b/lib/php/page.php
@@ -38,6 +38,8 @@ class Page extends nb {
 
   public $js = [];
   public $js_code = '';
+  public $js_code_pre = '';
+  public $js_code_post = '';
 
   public $body_class = '';
   public $body_id = '';
@@ -319,14 +321,20 @@ class Page extends nb {
 
   }
 
-  public static function end() {
+  public function end() {
 
     if (self::is('html')) {
       self::tag_end();
-      echo ''
-       . '</body>' . NB_EOL
-       . '</html>' . NB_EOL
-                       ;
+      if ($this->js_code_post) echo  ''
+        . '<script type="text/javascript"><!-- ' . NB_EOL
+                       #.'document.addEventListener("DOMContentLoaded", function() {'
+                               #.'alert("OK");'
+        . trim($this->js_code_post)."\n"
+                       #.'});'."\n"
+        . ' --></script>' . NB_EOL
+      ;
+      echo '</body>' . NB_EOL;
+      echo '</html>' . NB_EOL;
     }
 
   }
@@ -409,6 +417,12 @@ class Page extends nb {
       ;
 
       // JS
+      if ($this->js_code_pre) $head .=  ''
+        . '<script type="text/javascript"><!-- ' . NB_EOL
+        . trim($this->js_code_pre)."\n"
+        . ' --></script>' . NB_EOL
+      ;
+
       foreach ((array)($this->js) as $vv) {
         foreach ($this->path2url($vv) as $v) {
           $head .= '<script src="' . $v . '" type="text/javascript"></script>' . NB_EOL;

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index c51a04f7e8925d61153a3a2ca56370906c02e43f..9f90be5c77a53272d77abd7688c9ef41ad09ad03 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -1,5 +1,6 @@
 <?php
-define('PRODUCTION',empty($_SERVER) or empty($_SERVER['PRODUCTION']) ? false : (bool)$_SERVER['PRODUCTION']);
+#define('PRODUCTION',((empty($_SERVER) or empty($_SERVER['PRODUCTION']) ? false : (bool)$_SERVER['PRODUCTION']));
+define('PRODUCTION',false);
 #define('BOOTSTRAP',isset($_REQUEST['_bootstrap']) ? true : false);
 define('BOOTSTRAP',true);
 
@@ -26,11 +27,11 @@ class DbQ extends nb {
        const ACTIONS_NO_TITLE = ['ls','vi'];
        const PARAM_DB_DEFAULT = 'ls';
        
-       const READ = 9;
-       const ADD = 13;
-       const UPDATE = 15;
-       const WRITE = 19;
-       const DELETE = 29;
+       const READ = 10;
+       const ADD = 20;
+       const UPDATE = 30;
+       const WRITE = 40;
+       const DELETE = 50;
        const ADMIN = 99;
 
        public $perm = self::ADMIN;
@@ -300,7 +301,8 @@ class DbQ extends nb {
 
                if (empty($this->_nopage)) {
 
-                       $this->page->js_code = 'window._dbq = '.json_encode($this->conf);
+                       #$this->page->js_code_post = 'window._dbq = '.json_encode($this->conf).';dbqLoad();';
+                       $this->page->js_code_post = 'dbqLoad('.json_encode($this->conf).');';
 
                        if ($obj != 'logout') {
                                list($title,$nav) = $this->title_nav();

diff --git a/www/dbq/html/default.js b/www/dbq/html/default.js
index d89cd41d1e37206f3858ccfa2776e5af698ced08..de65ad8e18809a83205bab7443d747a282e24915 100644 (file)
--- a/www/dbq/html/default.js
+++ b/www/dbq/html/default.js
@@ -1,4 +1,10 @@
-document.addEventListener("DOMContentLoaded", function() {
+/*
+if (window._dbq != undefined)
+*/
+//document.addEventListener("DOMContentLoaded", function() {
+//});
+function dbqLoad(DBQ) {
+       window._dbq = DBQ;
 
        $('.db-rows form.rm').each(function() {
        });
@@ -181,7 +187,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
        });
 
-});
+} // dbqLoad()
 
 function form_clean(form) {
                var e;
@@ -275,3 +281,16 @@ function iframe_embed(href) {
        console.log(href);
        return false;
 }
+
+/*
+//console.log(window._dbq);
+if (window._dbq != undefined) {
+       if (document.readyState === 'loading') {  // Loading hasn't finished yet
+               document.addEventListener('DOMContentLoaded', dbqLoad);
+       } else {  // `DOMContentLoaded` has already fired
+               dbqLoad;
+       }
+} else {
+//console.log('ERR');
+}
+*/