Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 14, 2012
@cquinders cquinders set default timezone af8dfc1
@cquinders cquinders fix support for https 7b59bca
@cquinders cquinders support yui loader metadata >3.3.0
Fixed code to work with yui loader metadata greater than 3.3.0 ONLY. No
backwards compatibility.
89fd946
@cquinders cquinders added 3.5.0 metadata 700ca54
View
11,366 lib/meta/config_3.5.0.php
11,366 additions, 0 deletions not shown
View
1  lib/meta/json_3.5.0.txt
1 addition, 0 deletions not shown
View
1  lib/meta/json_aliases_3.5.0.txt
@@ -0,0 +1 @@
+{"anim":["anim-base","anim-color","anim-curve","anim-easing","anim-node-plugin","anim-scroll","anim-xy"],"app":["app-base","app-transitions","model","model-list","router","view"],"attribute":["attribute-base","attribute-complex"],"autocomplete":["autocomplete-base","autocomplete-sources","autocomplete-list","autocomplete-plugin"],"base":["base-base","base-pluginhost","base-build"],"cache":["cache-base","cache-offline","cache-plugin"],"collection":["array-extras","arraylist","arraylist-add","arraylist-filter","array-invoke"],"controller":["router"],"dataschema":["dataschema-base","dataschema-json","dataschema-xml","dataschema-array","dataschema-text"],"datasource":["datasource-local","datasource-io","datasource-get","datasource-function","datasource-cache","datasource-jsonschema","datasource-xmlschema","datasource-arrayschema","datasource-textschema","datasource-polling"],"datatable":["datatable-core","datatable-table","datatable-head","datatable-body","datatable-base","datatable-column-widths","datatable-message","datatable-mutable","datatable-sort","datatable-datasource"],"datatable-deprecated":["datatable-base-deprecated","datatable-datasource-deprecated","datatable-sort-deprecated","datatable-scroll-deprecated"],"datatype":["datatype-number","datatype-date","datatype-xml"],"datatype-date":["datatype-date-parse","datatype-date-format"],"datatype-number":["datatype-number-parse","datatype-number-format"],"datatype-xml":["datatype-xml-parse","datatype-xml-format"],"dd":["dd-ddm-base","dd-ddm","dd-ddm-drop","dd-drag","dd-proxy","dd-constrain","dd-drop","dd-scroll","dd-delegate"],"dom":["dom-base","dom-screen","dom-style","selector-native","selector"],"editor":["frame","editor-selection","exec-command","editor-base","editor-para","editor-br","editor-bidi","editor-tab","createlink-base"],"event":["event-base","event-delegate","event-synthetic","event-mousewheel","event-mouseenter","event-key","event-focus","event-resize","event-hover","event-outside","event-touch","event-move","event-flick","event-valuechange"],"event-custom":["event-custom-base","event-custom-complex"],"event-gestures":["event-flick","event-move"],"handlebars":["handlebars-compiler"],"highlight":["highlight-base","highlight-accentfold"],"history":["history-base","history-hash","history-hash-ie","history-html5"],"io":["io-base","io-xdr","io-form","io-upload-iframe","io-queue"],"json":["json-parse","json-stringify"],"loader":["loader-base","loader-rollup","loader-yui3"],"node":["node-base","node-event-delegate","node-pluginhost","node-screen","node-style"],"pluginhost":["pluginhost-base","pluginhost-config"],"querystring":["querystring-parse","querystring-stringify"],"recordset":["recordset-base","recordset-sort","recordset-filter","recordset-indexer"],"resize":["resize-base","resize-proxy","resize-constrain"],"slider":["slider-base","slider-value-range","clickable-rail","range-slider"],"text":["text-accentfold","text-wordbreak"],"widget":["widget-base","widget-htmlparser","widget-skin","widget-uievents"]}
View
3  phploader/combo.php
@@ -37,6 +37,9 @@
$queryString = getenv('QUERY_STRING') ? urldecode(getenv('QUERY_STRING')) : '';
if (isset($queryString) && !empty($queryString)) {
+
+ date_default_timezone_set("Etc/GMT");
+
$yuiFiles = explode("&", $queryString);
$contentType = strpos($yuiFiles[0], ".js") ? 'application/x-javascript' :
' text/css';
View
6 phploader/combo_functions.inc.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
/**
* Copyright (c) 2009, Yahoo! Inc. All rights reserved.
* Code licensed under the BSD License:
@@ -11,7 +11,7 @@
//(modified version of full_url), license: MIT
function server($includeRequestUri=false)
{
- $s = getenv('HTTPS') ? '' : (getenv('HTTPS') == 'on') ? 's' : '';
+ $s = isset($_SERVER['HTTPS']) && getenv('HTTPS') == 'on' ? 's' : '';
$protocol = substr(
strtolower(getenv('SERVER_PROTOCOL')), 0,
strpos(strtolower(getenv('SERVER_PROTOCOL')), '/')
@@ -35,4 +35,4 @@ function alphaImageLoaderPathCorrection($matches)
. '\'';
return $newFilePath;
-}
+}
View
70 phploader/loader.php
@@ -50,6 +50,7 @@
define('YUI_TAGS', 'TAGS');
define('YUI_TYPE', 'type');
define('YUI_URL', 'url');
+define('YUI_USE','use');
/**
* The YUI PHP loader base class which provides dynamic server-side loading for
@@ -346,7 +347,7 @@ function YAHOO_util_Loader(
"which version of YUI to use!"
);
}
-
+ $this->yuiVersion = $yuiVersion;
/*
* Include the metadata config file that corresponds to the requested YUI
* version Note: we attempt to find a prebuilt config_{version}.php file
@@ -378,7 +379,9 @@ function YAHOO_util_Loader(
$this->apcAvail = function_exists('apc_fetch');
$this->jsonAvail = function_exists('json_encode');
$this->customModulesInUse = empty($modules) ? false : true;
- $this->base = $yui_current[YUI_BASE];
+ // if(intval(preg_replace('/\./','',$yuiVersion))<340){
+ // $this->base = $yui_current[YUI_BASE];
+ // }
$this->comboDefaultVersion = $yuiVersion;
$this->fullCacheKey = null;
$cache = null;
@@ -402,7 +405,7 @@ function YAHOO_util_Loader(
if ($noYui) {
$this->modules = array();
} else {
- $this->modules = $yui_current['moduleInfo'];
+ $this->modules = $yui_current;
}
if ($modules) {
@@ -411,7 +414,7 @@ function YAHOO_util_Loader(
);
}
- $this->skin = $yui_current[YUI_SKIN];
+ $this->skin = array( 'defaultSkin' => 'sam', 'after' => array(),'base' => 'assets/skins/');
$this->skin['overrides'] = array();
$this->skin[YUI_PREFIX] = "skin-";
$this->filters = array(
@@ -470,7 +473,21 @@ function load()
//Expects N-number of named components to load
$args = func_get_args();
foreach ($args as $arg) {
- $this->loadSingle($arg);
+ if (isset($this->modules[$arg])) {
+ if (isset($this->modules[$arg][YUI_USE])) {
+ if (is_array($this->modules[$arg][YUI_USE])) {
+ foreach ($this->modules[$arg][YUI_USE] as $name) {
+ $this->loadSingle($name);
+ }
+ } else {
+ if ($this->modules[$arg][YUI_USE] != '') {
+ $this->loadSingle($this->modules[$arg][YUI_USE]);
+ }
+ }
+ } else {
+ $this->loadSingle($arg);
+ }
+ }
}
}
@@ -554,18 +571,18 @@ function skinSetup($name)
// module-specific
if (isset($skin[2])) {
$dep = $this->modules[$skin[2]];
- $package = (isset($dep[YUI_PKG])) ? $dep[YUI_PKG] : $skin[2];
- $path = $package . '/' . $s[YUI_BASE] . $skin[1] . '/' .
- $skin[2] . '.css';
+ $skin3 = (isset($skin[3]) && $skin[3] != '') ? '-'.$skin[3] : '';
+ $component = $skin[2] . $skin3 ;
+ $path = $component . '/' . $s[YUI_BASE] . $skin[1] . '/' . $component . '.css';
$this->modules[$skinName] = array(
- "name" => $skinName,
- "type" => YUI_CSS,
- "path" => $path,
- "after" => $s[YUI_AFTER]
- );
-
- // rollup skin
- } else {
+ "name" => $skinName,
+ "type" => YUI_CSS,
+ "path" => $path,
+ "after" => $s[YUI_AFTER]
+ );
+ // rollup skin
+ } else {
+ //ToDo what about rollup skins in yui > 3.4.x
$path = $s[YUI_BASE] . $skin[1] . '/' . $s[YUI_PATH];
$newmod = array(
"name" => $skinName,
@@ -976,6 +993,25 @@ function getAllDependencies(
//Add any requirements defined on the module itself
if (isset($m[YUI_REQUIRES])) {
$origreqs = $m[YUI_REQUIRES];
+
+ $requirements = array();
+ foreach ($origreqs as $arg) {
+ if (isset($this->modules[$arg][YUI_USE])) {
+ if (is_array($this->modules[$arg][YUI_USE])) {
+ foreach ($this->modules[$arg][YUI_USE] as $name) {
+ $requirements[$name] = $name;
+ }
+ } else {
+ if ($this->modules[$arg][YUI_USE] != '') {
+ $requirements[$arg] = $this->modules[$arg][YUI_USE];
+ }
+ }
+ } else {
+ $requirements[$arg] = $arg;
+ }
+ }
+ $origreqs = $requirements;
+
foreach ($origreqs as $r) {
if (!isset($reqs[$r])) {
$reqs[$r] = true;
@@ -1843,4 +1879,4 @@ function getLoadedModulesAsJSON()
return json_encode($this->getLoadedModules());
}
-}
+}

No commit comments for this range

Something went wrong with that request. Please try again.