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.
base fork: assistunion/oxygen
base: 9741349cb1
...
head fork: assistunion/oxygen
compare: d7beab13ac
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
2  asset/asset.class.php
@@ -5,7 +5,7 @@
public $added = array();
public $pipeline = false;
public $process = false;
- private $ext = '';
+ public $ext = '';
private $hash = false;
private $compiled = false;
View
6 asset/js/js.class.php
@@ -22,9 +22,9 @@ protected function processOne($item) {
} else {
return Oxygen_Utils_Text::format(
self::JQUERY_WRAPPER,
- $asset->component !== false ? '.' . $asset->component : 'body',
- $asset->class,
- $asset->name,
+ $item->component !== false ? '.' . $item->component : 'body',
+ $item->class,
+ $item->name,
$source
);
}
View
3  common/application/view.js
@@ -6,13 +6,14 @@ var $document = $(document)
;
function updateLayout() {
- clientHeight = $document.height()-$header.height()-$footer.height();
+ var clientHeight = $document.height()-$header.height()-$footer.height();
$content.height(clientHeight);
$menu.height(clientHeight);
}
var lazyLayout = _.debounce(updateLayout, 300);
$(window).resize(updateLayout);
+$(window).resize(updateLayout);
updateLayout();
View
15 controller/view.php
@@ -1,10 +1,5 @@
-<?print_r($this->args)?>
-<ul>
-<li><?$this['.']->put_as_current()?></li>
-<?if(isset($this['..'])):?>
-<li><?$this['..']->put_as_parent()?></li>
-<?endif?>
-<?foreach($this as $route=>$child):?>
-<li><?=$child->put_as_child()?></li>
-<?endforeach?>
-</ul>
+<?if($this->child):?>
+<?$this->child->put_view()?>
+<?else:?>
+<?$this->put_tiled()?>
+<?endif?>

No commit comments for this range

Something went wrong with that request. Please try again.