R55017 - in /trunk/etemplate: ./ inc/ js/

ralfbecker_sf 2016-02-16 10:14:02 UTC #1

Author: ralfbecker
New Revision: 55017

URL: http://svn.stylite.de/viewvc/egroupware?rev=55017&view=rev
Log:
quiten a warning, if apps return nothing

Modified:
trunk/etemplate/ (props changed)
trunk/etemplate/inc/class.etemplate_new.inc.php
trunk/etemplate/js/et2_extension_nextmatch.js
trunk/etemplate/js/et2_widget_link.js
trunk/etemplate/js/et2_widget_textbox.js

Propchange: trunk/etemplate/

— svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 16 11:14:02 2016
@@ -1,1 +1,1 @@
-/branches/14.2/etemplate:52426,52645-52646,52823,54046,54053
+/branches/14.2/etemplate:52426,52645-52646,52823,54046,54053,55016

Modified: trunk/etemplate/inc/class.etemplate_new.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.etemplate_new.inc.php?rev=55017&r1=55016&r2=55017&view=diff

— trunk/etemplate/inc/class.etemplate_new.inc.php (original)
+++ trunk/etemplate/inc/class.etemplate_new.inc.php Tue Feb 16 11:14:02 2016
@@ -710,15 +710,18 @@
$widgets = $GLOBALS[‘egw’]->hooks->process(‘etemplate2_register_widgets’);
foreach($widgets as $app => $list)
{

foreach($list as $class)
{
```
  try
```
```
  {
```

  	class_exists($class);	// trigger autoloader

```
  }
```
```
  catch(Exception $e)
```
```
  {
```
```
  	error_log($e->getMessage());
```

if (is_array($list))
{
```
  foreach($list as $class)
```
```
  {
```
```
  	try
```
```
  	{
```

  		class_exists($class);	// trigger autoloader

```
  	}
```
```
  	catch(Exception $e)
```
```
  	{
```
```
  		error_log($e->getMessage());
```
```
  	}
  }
```
}
}

Modified: trunk/etemplate/js/et2_extension_nextmatch.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_extension_nextmatch.js?rev=55017&r1=55016&r2=55017&view=diff

— trunk/etemplate/js/et2_extension_nextmatch.js (original)
+++ trunk/etemplate/js/et2_extension_nextmatch.js Tue Feb 16 11:14:02 2016
@@ -2268,6 +2268,7 @@
var settings = this.nextmatch.options.settings;

	this.div.prependTo(nm_div);

  this.div.addClass('et2_toolbar');	// get toolbar styling

  // Left & Right (& row) headers
  this.headers = [

@@ -2279,20 +2280,21 @@
// The rest of the header
this.header_div = this.row_div = jQuery(document.createElement(“div”))
.addClass(“nextmatch_header_row”)

  	.addClass('et2_toolbar_actionlist')	// get toolbar styling
  	.appendTo(this.div);

  // Search
  this.search_box = jQuery(document.createElement("div"))
  	.prependTo(egwIsMobile()?this.nextmatch.div:this.row_div);

```
  // searchbox widget	
```

  // searchbox widget
  this.et2_searchbox = et2_createWidget('searchbox', {id:"search",onchange:function(){
  		self.nextmatch.applyFilters({search: this.get_value()});
  	}
  },this);

  // Set activeFilters to current value
  this.nextmatch.activeFilters.search = settings.search;

  this.et2_searchbox.set_value(settings.search);
  /**
   *  Mobile theme specific part for nm header

Modified: trunk/etemplate/js/et2_widget_link.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_widget_link.js?rev=55017&r1=55016&r2=55017&view=diff

— trunk/etemplate/js/et2_widget_link.js (original)
+++ trunk/etemplate/js/et2_widget_link.js Tue Feb 16 11:14:02 2016
@@ -1388,7 +1388,7 @@
.appendTo(this.list)
.addClass(“et2_link loading”)
.click( function(e){

  		if (self.options.expose_view && typeof _link_data.type !='undefined'

  		if (self.options.expose_view && typeof _link_data.type !='undefined'
  			&& _link_data.type.match(self.mime_regexp,'ig'))
  		{
  			self._init_blueimp_gallery(e, _link_data);

@@ -1602,7 +1602,7 @@
window.location = url+"?download";
return false;
}

  		// Multiple file download for those that support it
  		a = $j(a)
  			.prop('href', url)

@@ -1615,7 +1615,7 @@
a.remove();
return false;
}

  	self.egw().open(link_data, "", "view",'download',link_data.target ? link_data.target : link_data.app,link_data.app);
  });
  this.context.addItem("zip", this.egw().lang("Save as Zip"), this.egw().image('save_zip'), function(menu_item) {

@@ -1767,7 +1767,7 @@
{
this._format_vfs($td, dirs, _link_data);
}

  	//Bind the click handler if there is download_url

  	//Bind the click handler if there is download_url
  	if (_link_data && (typeof _link_data.download_url != 'undefined' || _link_data.app !='egw-data'))
  	{
  		$td.click( function(){

@@ -1781,7 +1781,7 @@
{
self.egw().open(_link_data, “”, “view”,null,_link_data.target ? _link_data.target : _link_data.app,_link_data.app);
}

```
  		});	
```

```
  		});
  	}
  }
```

@@ -1841,7 +1841,7 @@
self.context.getItem(“zip”).set_enabled($j(’[id^=“link_-”]’,this.list).length >= 2);
// Show delete item only if the widget is not readonly
self.context.getItem(“delete”).set_enabled(!self.options.readonly);

  	self.context.data = _link_data;
  	self.context.showAt(e.pageX, e.pageY, true);
  	e.preventDefault();

Modified: trunk/etemplate/js/et2_widget_textbox.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_widget_textbox.js?rev=55017&r1=55016&r2=55017&view=diff

— trunk/etemplate/js/et2_widget_textbox.js (original)
+++ trunk/etemplate/js/et2_widget_textbox.js Tue Feb 16 11:14:02 2016
@@ -154,10 +154,10 @@
});
}
},

/**
- Override the parent set_id method to manuipulate the input DOM node

- @param {type} _value
- @returns {undefined}
  */
  @@ -165,12 +165,12 @@
  {
  this._super.apply(this,arguments);
  // Remove the name attribute inorder to affect autocomplete=“off”

  // for no password save. ATM seems all browsers ignore autocomplete for

  // for no password save. ATM seems all browsers ignore autocomplete for
  // input field inside the form
  if (this.options.type === "passwd"
  		&& this.options.autocomplete === "off") this.input.removeAttr('name');

destroy: function() {
var node = this.getInputNode();
if (node) $j(node).unbind(“keypress”);
@@ -276,7 +276,7 @@
this.options.autocomplete = _value;
this.input.attr(‘autocomplete’, _value);
},

resize: function (_height)
{
if (_height && this.options.multiline)
@@ -409,7 +409,7 @@
/**
- et2_searchbox is a widget which provides a collapsable input search
- with on searching indicator and clear handler regardless of any browser limitation.

- @type type
  */
  var et2_searchbox = et2_textbox.extend(
  @@ -428,23 +428,23 @@
  this.value = “”;
  this.div = jQuery(document.createElement(‘div’))
  .addClass(‘et2_searchbox’);

  this._super.apply(this, arguments);
  this.setDOMNode(this.div[0]);
  this._createWidget();

_createWidget:function()
{
var self = this;
// search button indicator

  this.button = et2_createWidget('button',{class:"et2_button_with_image"},this);

```
  this.button.onclick= function(){
```

  this.button = et2_createWidget('button',{image: 'search', background_image: true/*class:"et2_button_with_image"*/},this);

  this.button.onclick = function(){
  	self._show_hide(true);

```
  	self.search.input.focus()
```

  	self.search.input.focus();
  };
  this.div.prepend(this.button.getDOMNode());

  // input field
  this.search = et2_createWidget('textbox',{"blur":egw.lang("search"),
  	onkeypress:function(event) {

@@ -470,7 +470,7 @@
self.set_value(’’);
}
},

  	blur: function(event){
  		self._show_hide(false);
  		if (self._oldValue != self.get_value()) {

@@ -482,7 +482,7 @@
}
});
this.div.append(this.search.getDOMNode());

  // clear button implementation
  this.clear = jQuery(document.createElement('span'))
  		.addClass('ui-icon clear')

@@ -503,9 +503,9 @@
})
.appendTo(this.div);
},

/**
- Show/hide search field

/**
- Show/hide search field
- @param {boolean} _stat true means show and false means hide
  */
  _show_hide: function(_stat)
  @@ -513,7 +513,7 @@
  jQuery(this.search.getDOMNode()).toggleClass(‘hide’,!_stat);
  jQuery(‘span.clear’,this.div).toggleClass(‘hide’,!_stat);
  },

/**
- toggle search button status based on value
  */
  @@ -535,17 +535,17 @@
  change:function()
  {
  this._searchToggleState();

```
  this._super.apply(this,arguments);
```
},

get_value:function(){
return this.search.input.val();
},

/**
- override doLoadingFinished in order to set initial state

/**
- override doLoadingFinished in order to set initial state
  */
  doLoadingFinished: function()
  {

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs