[Quickfw-git] SF.net Git: quickfw branch, master, updated. eac6e05b69f52a1d68416862d63cdf4d6069c6d6

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  eac6e05b69f52a1d68416862d63cdf4d6069c6d6 (commit)
      from  f447a56ecf5a9d5f13d98512771b6f74904d2f36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eac6e05b69f52a1d68416862d63cdf4d6069c6d6
Author: Ivan Borzenkov <iva...@li...>
Date:   Sat Sep 4 16:46:54 2010 +0400

    js_main аналогично css_main

diff --git a/QFW/QuickFW/Plugs.php b/QFW/QuickFW/Plugs.php
index daf570e..1e16692 100644
--- a/QFW/QuickFW/Plugs.php
+++ b/QFW/QuickFW/Plugs.php
@@ -43,6 +43,7 @@ class QuickFW_Plugs
 	protected $HeadData = array();
 
 	protected $IncFiles = array(
+		'js_main'=>array(),
 		'js'=>array(),
 		'css_main'=>array(),
 		'css'=>array(),
@@ -53,7 +54,7 @@ class QuickFW_Plugs
 
 	public function addJS($file, $noBase=false)
 	{
-		$this->IncFiles['js'][]=($noBase?'':QFW::$config['redirection']['baseUrl']).$file;
+		$this->IncFiles['js'.($this->isMain?'_main':'')][]=($noBase?'':QFW::$config['redirection']['baseUrl']).$file;
 		return "";
 	}
 
@@ -119,6 +120,7 @@ class QuickFW_Plugs
 	{
 		$head='';
 		$this->IncFiles['css'] = array_merge($this->IncFiles['css_main'], $this->IncFiles['css']);
+		$this->IncFiles['js'] = array_merge($this->IncFiles['js_main'], $this->IncFiles['js']);
 
 		$this->IncFiles['css'] = array_unique($this->IncFiles['css']);
 		if (count($this->IncFiles['css'])>0)

-----------------------------------------------------------------------

Summary of changes:
 QFW/QuickFW/Plugs.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
quickfw