[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18572] phpgwapi.javascript -> phpgwapi.js transition
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [18572] phpgwapi.javascript -> phpgwapi.js transition |
|
Date: |
Sun, 01 Jun 2008 11:09:24 +0000 |
Revision: 18572
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18572
Author: skwashd
Date: 2008-06-01 11:09:22 +0000 (Sun, 01 Jun 2008)
Log Message:
-----------
phpgwapi.javascript -> phpgwapi.js transition
Modified Paths:
--------------
trunk/admin/inc/class.uiaccounts.inc.php
trunk/email/inc/class.uicompose.inc.php
trunk/email/inc/class.uiindex.inc.php
trunk/filemanager/inc/class.uiaction_base.inc.php
trunk/news_admin/inc/class.uinews.inc.php
trunk/phpbrain/inc/class.uikb.inc.php
trunk/phpgwapi/inc/class.jscalendar.inc.php
trunk/phpgwapi/inc/class.richtext.inc.php
trunk/phpgwapi/inc/class.ui_tools.inc.php
trunk/phpgwapi/templates/desktop/head.inc.php
Modified: trunk/admin/inc/class.uiaccounts.inc.php
===================================================================
--- trunk/admin/inc/class.uiaccounts.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/admin/inc/class.uiaccounts.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -335,10 +335,6 @@
}
}
- if ( !isset($GLOBALS['phpgw']->js) ||
!is_object($GLOBALS['phpgw']->js) )
- {
- $GLOBALS['phpgw']->js =
createObject('phpgwapi.javascript');
- }
$js =& $GLOBALS['phpgw']->js;
$js->validate_file('base', 'groups', 'admin');
@@ -1092,4 +1088,3 @@
}
}
-?>
Modified: trunk/email/inc/class.uicompose.inc.php
===================================================================
--- trunk/email/inc/class.uicompose.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/email/inc/class.uicompose.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -98,13 +98,6 @@
$this->tpl->set_var('widget_toolbar',$this->widgets->get_toolbar());
- //FIX this
- /* if(!isset($GLOBALS['phpgw']->js) ||
!is_object($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
CreateObject('phpgwapi.javascript');
- }
-
$GLOBALS['phpgw']->js->validate_file('core','base','phpgwapi');
- */
// fill template vars
$tpl_vars = Array(
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
Modified: trunk/email/inc/class.uiindex.inc.php
===================================================================
--- trunk/email/inc/class.uiindex.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/email/inc/class.uiindex.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -32,10 +32,6 @@
function uiindex()
{
- if(!isset($GLOBALS['phpgw']->js) ||
!is_object($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
CreateObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('core','base','phpgwapi');
$folder = phpgw::get_var('folder');
Modified: trunk/filemanager/inc/class.uiaction_base.inc.php
===================================================================
--- trunk/filemanager/inc/class.uiaction_base.inc.php 2008-06-01 10:31:46 UTC
(rev 18571)
+++ trunk/filemanager/inc/class.uiaction_base.inc.php 2008-06-01 11:09:22 UTC
(rev 18572)
@@ -26,10 +26,6 @@
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$GLOBALS['phpgw']->xslttpl->add_file('widgets');
- if(!is_object($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
createObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('core','popup');
$this->bofilemanager =
CreateObject('filemanager.bofilemanager');
}
@@ -75,6 +71,3 @@
}
}
-
-
-?>
Modified: trunk/news_admin/inc/class.uinews.inc.php
===================================================================
--- trunk/news_admin/inc/class.uinews.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/news_admin/inc/class.uinews.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -807,10 +807,6 @@
*/
function _modify($type = 'edit')
{
- if ( !is_object($GLOBALS['phpgw']->js) )
- {
- $GLOBALS['phpgw']->js =
CreateObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('base', 'toggle',
'news_admin');
$GLOBALS['phpgw']->js->add_event('load', 'toggle();');
@@ -898,4 +894,3 @@
return $selectlist;
}
}
-?>
Modified: trunk/phpbrain/inc/class.uikb.inc.php
===================================================================
--- trunk/phpbrain/inc/class.uikb.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/phpbrain/inc/class.uikb.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -683,11 +683,6 @@
if (!$this->sitemgr)
{
- //
$GLOBALS['phpgw_info']['flags']['css'] = $this->tabs_css(); Don't use this
'cause incompatible with sitemgr
-
if(address@hidden($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
CreateObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('tabs','tabs');
$GLOBALS['phpgw']->js->set_onload('tab.init();');
$GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>function
openpopup() {window1=window.open('" .
$this->link('menuaction=phpbrain.uikb.pop_search') . "', 'Search',
'width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes');}</script>";
@@ -2074,4 +2069,3 @@
die();
}
}
-?>
Modified: trunk/phpgwapi/inc/class.jscalendar.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jscalendar.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/phpgwapi/inc/class.jscalendar.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -17,7 +17,7 @@
* @subpackage gui
* @internal The constructor load the necessary javascript-files
*/
-class jscalendar
+class phpgwapi_jscalendar
{
/**
* @author ralfbecker
@@ -27,10 +27,6 @@
*/
function jscalendar($do_header=True)
{
- if(!is_object($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
createObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('jscalendar',
'calendar_stripped');
$this->phpgw_js_url =
$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js';
$this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
Modified: trunk/phpgwapi/inc/class.richtext.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.richtext.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/phpgwapi/inc/class.richtext.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -1,22 +1,23 @@
<?php
/**
- * Rich Text Editor Handler class
+ * phpGroupWare - Rich Text Editor Handler class
*
- * Allows different rich text wysiwyg html editors to be used within
phpgw
+ * Wrap a rich text editor widget for phpGroupWare
+ * Allows widgets to be swapped without code refactoring
*
- * @author Dave Hall skwashd at phpgroupware.org
- * @copyright Copyright (C) 2006 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @author Dave Hall <address@hidden>
+ * @copyright Copyright (C) 2006 - 2008 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgwapi
- * @subpackage gui
+ * @package phpgroupware
+ * @subpackage phpgwapi
* @version $Id$
*/
/**
* Rich Text Editor Handler class
*
- * @package phpgwapi
- * @subpackage gui
+ * @package phpgroupware
+ * @subpackage phpgwapi
*/
class phpgwapi_richtext
{
Modified: trunk/phpgwapi/inc/class.ui_tools.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.ui_tools.inc.php 2008-06-01 10:31:46 UTC (rev
18571)
+++ trunk/phpgwapi/inc/class.ui_tools.inc.php 2008-06-01 11:09:22 UTC (rev
18572)
@@ -27,10 +27,6 @@
'nonavbar' => true,
);
- if (!isset ($GLOBALS['phpgw']->js) ||
!is_object($GLOBALS['phpgw']->js))
- {
- $GLOBALS['phpgw']->js =
createObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->validate_file('yahoo', 'YAHOO');
$GLOBALS['phpgw']->js->validate_file('yahoo', 'log');
$GLOBALS['phpgw']->js->validate_file('yahoo', 'color');
@@ -194,4 +190,3 @@
return $elm;
}
}
-?>
Modified: trunk/phpgwapi/templates/desktop/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/desktop/head.inc.php 2008-06-01 10:31:46 UTC
(rev 18571)
+++ trunk/phpgwapi/templates/desktop/head.inc.php 2008-06-01 11:09:22 UTC
(rev 18572)
@@ -32,10 +32,6 @@
$theme_css =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/desktop/css/desktop.css';
}
- if( !is_object($GLOBALS['phpgw']->js) )
- {
- $GLOBALS['phpgw']->js = createObject('phpgwapi.javascript');
- }
$GLOBALS['phpgw']->js->set_onload('initPage();');
$var = Array (
@@ -49,4 +45,3 @@
$tpl->set_var($var);
$tpl->pfp('out','head');
unset($tpl);
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18572] phpgwapi.javascript -> phpgwapi.js transition,
Dave Hall <=