Changeset 16733


Ignore:
Timestamp:
07/14/12 19:44:11 (7 years ago)
Author:
grum
Message:

update GPC framework

Location:
extensions/GrumPluginClasses
Files:
6 added
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/GrumPluginClasses/classes/GPCCore.class.inc.php

    r16012 r16733  
    265265        { 
    266266          $config[$key][$key2]=$val2; 
     267 
     268          if(isset($conf['plugin.'.$pluginName]) and isset($conf['plugin.'.$pluginName][$key]) and isset($conf['plugin.'.$pluginName][$key][$key2])) 
     269              $config[$key][$key2]=$conf['plugin.'.$pluginName][$key][$key2]; 
    267270        } 
    268271      } 
    269272      else 
    270273      { 
    271         $config[$key] =$val; 
     274        $config[$key]=$val; 
     275        if(isset($conf['plugin.'.$pluginName]) and isset($conf['plugin.'.$pluginName][$key])) 
     276            $config[$key]=$conf['plugin.'.$pluginName][$key]; 
    272277      } 
    273278    } 
     
    856861          self::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui')); 
    857862 
    858           self::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui')); 
    859863          self::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget')); 
    860864          self::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery.ui.mouse')); 
     
    872876          self::addHeaderJS('gpc.inputPages', GPC_PATH.'js/ui.inputPages.js', array('jquery.ui.dialog')); 
    873877          self::addHeaderJS('gpc.dynamicTable', GPC_PATH.'js/ui.dynamicTable.js', array('jquery.ui.dialog')); 
     878          break; 
     879        case 'progressArea': 
     880          self::addHeaderCSS('gpc.progressArea', GPC_PATH.'css/progressArea.css'); 
     881          self::addHeaderCSS('gpc.progressAreaT', sprintf($themeFile, 'progressArea')); 
     882          self::addHeaderJS('jquery.ui', 'themes/default/js/ui/jquery.ui.core.js', array('jquery')); 
     883          self::addHeaderJS('jquery.ui.widget', 'themes/default/js/ui/jquery.ui.widget.js', array('jquery.ui')); 
     884          self::addHeaderJS('jquery.ui.mouse', 'themes/default/js/ui/jquery.ui.mouse.js', array('jquery.ui.widget')); 
     885          self::addHeaderJS('jquery.ui.position', 'themes/default/js/ui/jquery.ui.position.js', array('jquery.ui.mouse')); 
     886          self::addHeaderJS('jquery.ui.draggable', 'themes/default/js/ui/jquery.ui.draggable.js', array('jquery.ui.position')); 
     887          self::addHeaderJS('jquery.ui.sortable', 'themes/default/js/ui/jquery.ui.sortable.js', array('jquery.ui.draggable')); 
     888          self::addHeaderJS('jquery.ui.dialog', 'themes/default/js/ui/jquery.ui.dialog.js', array('jquery.ui.sortable')); 
     889          self::addHeaderJS('gpc.progressArea', GPC_PATH.'js/ui.progressArea.js', array('jquery.ui.dialog')); 
     890          break; 
     891        case 'timer': 
     892          self::addHeaderJS('gpc.timer', GPC_PATH.'js/ui.timer.js', array('jquery')); 
    874893          break; 
    875894      } 
Note: See TracChangeset for help on using the changeset viewer.