[Fmsystem-commits] [17449] property: javascript init

[sigurdne]

Revision: 17449
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17449
Author:   sigurdne
Date:     2017-12-17 14:58:28 -0500 (Sun, 17 Dec 2017)
Log Message:
-----------
property: javascript init

Modified Paths:
--------------
    trunk/property/inc/class.uiadmin_entity.inc.php
    trunk/property/inc/class.uiagreement.inc.php
    trunk/property/inc/class.uibudget.inc.php
    trunk/property/inc/class.uis_agreement.inc.php

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2017-12-16 16:39:04 UTC 
(rev 17448)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2017-12-17 19:58:28 UTC 
(rev 17449)
@@ -754,7 +754,7 @@
                                        'date', 'security', 'file'))
                        );
 
-                       $GLOBALS['phpgw']->js->validate_file('portico', 
'admin_entity.edit', 'property');
+                       self::add_javascript('property', 'portico', 
'admin_entity.edit.js');
                        $appname = lang('entity');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->type_app[$this->type]) . ' - ' . $appname . ': ' . $function_msg;
@@ -1031,7 +1031,7 @@
                        phpgwapi_jquery::load_widget('core');
                        phpgwapi_jquery::load_widget('numberformat');
 
-                       $GLOBALS['phpgw']->js->validate_file('portico', 
'admin_entity.edit_category', 'property');
+                       self::add_javascript('property', 'portico', 
'admin_entity.edit_category.js');
 
                        self::render_template_xsl(array('admin_entity', 
'datatable_inline', 'nextmatchs'), array(
                                'edit' => $data));

Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php        2017-12-16 16:39:04 UTC 
(rev 17448)
+++ trunk/property/inc/class.uiagreement.inc.php        2017-12-17 19:58:28 UTC 
(rev 17449)
@@ -641,7 +641,7 @@
                                        array('disablePagination' => true)
                                )
                        );
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'core', 'check.js');
 
                        $data = array
                                (
@@ -1168,8 +1168,8 @@
                                $record_limit = $this->bo->total_records;
                        }
 
-                       $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'overlib', 
'overlib.js');
+                       self::add_javascript('property', 'core', 'check.js');
 
                        if (isset($agreement['attributes']) && 
is_array($agreement['attributes']))
                        {
@@ -1812,7 +1812,7 @@
                                )
                        );
 
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'core', 'check.js');
 
                        $data = array
                                (
@@ -1920,7 +1920,7 @@
                        $content = $list['content'];
                        $table_header = $list['table_header'];
 
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'core', 'check.js');
 
                        //---datatable1 
settings---------------------------------------------------
                        //Prepare array for $datavalues[0]

Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php   2017-12-16 16:39:04 UTC (rev 
17448)
+++ trunk/property/inc/class.uibudget.inc.php   2017-12-17 19:58:28 UTC (rev 
17449)
@@ -1502,7 +1502,7 @@
                                'allrows' => $this->allrows
                        );
 
-                       $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
+                       self::add_javascript('property', 'overlib', 
'overlib.js');
 
                        $data = array
                                (

Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php      2017-12-16 16:39:04 UTC 
(rev 17448)
+++ trunk/property/inc/class.uis_agreement.inc.php      2017-12-17 19:58:28 UTC 
(rev 17449)
@@ -1089,10 +1089,9 @@
                                'id' => $id
                        );
 
-                       $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'overlib', 
'overlib.js');
+                       self::add_javascript('property', 'core', 'check.js');
 
-
                        if (isset($values['attributes']) && 
is_array($values['attributes']))
                        {
 
@@ -1761,8 +1760,8 @@
                                'entity_data' => $values['p']
                        ));
 
-                       $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'overlib', 
'overlib.js');
+                       self::add_javascript('property', 'core', 'check.js');
 
 
                        if (isset($values['attributes']) && 
is_array($values['attributes']))
@@ -2053,8 +2052,8 @@
                                unset($s_agreement['attributes']);
                        }
 
-                       $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
-                       $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
+                       self::add_javascript('property', 'overlib', 
'overlib.js');
+                       self::add_javascript('property', 'core', 'check.js');
 
                        $parameters = array
                                (