Skip to content
Permalink
Browse files
Merge branch 'master' of git@github.com:vito/chyrp into iphone_admin
  • Loading branch information
brucep committed Jul 3, 2008
2 parents f6a9170 + bf251a3 commit d12822b2b819bbf612f4547fe895def35c8f2cbd
Showing with 11 additions and 8 deletions.
  1. +3 −3 admin/layouts/default/default.css
  2. +2 −2 includes/admin.js.php
  3. +4 −1 includes/class/Twig/runtime.php
  4. +2 −2 includes/model/Post.php
@@ -595,7 +595,7 @@ a.next_page:hover,
a.prev_page:hover {
background: #f7f7f7;
border-color: #f7f7f7;
border-bottom-color: #d1d1d1;
border-bottom-color: #d1d1d1 !important;
border-right-color: #d1d1d1;
}
button:active,
@@ -621,7 +621,7 @@ button.boo:hover,
background: #d51800;
color: #fff;
border-color: #d51800;
border-bottom-color: #9f1000;
border-bottom-color: #9f1000 !important;
border-right-color: #9f1000;
}
button.boo:active,
@@ -645,7 +645,7 @@ button.yay:hover,
background: #189100;
color: #fff;
border-color: #189100;
border-bottom-color: #105f00;
border-bottom-color: #105f00 !important;
border-right-color: #105f00;
}
button.yay:active,
@@ -107,10 +107,10 @@ function prepare_write_bling() {
// Auto-expand text fields & auto-grow textareas.
$("input.text").each(function(){
if ($(this).parent().parent().attr("class") == "more_options") return
$(this).css("min-width", $(this).width()).Autoexpand()
$(this).css("min-width", $(this).outerWidth()).Autoexpand()
})
$("textarea").each(function(){
$(this).css("min-height", $(this).height()).autogrow()
$(this).css("min-height", $(this).outerHeight()).autogrow()
})

// Make the Feathers sortable
@@ -125,9 +125,12 @@ function twig_missing_filter($name)
$text = $args[0];
array_shift($args);

array_unshift($args, $name);
array_unshift($args, $text);

$trigger = Trigger::current();
if ($trigger->exists($name))
return $trigger->filter($name, $text, $args);
return call_user_func_array(array($trigger, "filter"), $args);

return $text;
}
@@ -498,11 +498,11 @@ private function parse($filter = false) {

if (isset(Feather::$custom_filters[$class])) # Run through feather-specified filters, first.
foreach (Feather::$custom_filters[$class] as $custom_filter)
$this->$custom_filter["field"] = call_user_func_array(array($class, $custom_filter["name"]), array($this->$custom_filter["field"], $this));
call_user_func_array($this->$custom_filter["field"], array($class, $custom_filter["name"]), $this);

if (isset(Feather::$filters[$class])) # Now actually filter it.
foreach (Feather::$filters[$class] as $filter)
$this->$filter["field"] = $trigger->filter($filter["name"], $this->$filter["field"], $this);
$trigger->filter($this->$filter["field"], $filter["name"], $this);
}
}

0 comments on commit d12822b

Please sign in to comment.