Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 0 insertions, 6 deletions

diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index da4a1b41..d69ab82c 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -21,12 +21,6 @@ class organize_theme {
   static function head($theme) {
     $item = $theme->item();
     if ($item && access::can("edit", $item) && $item->is_album()) {
-      // @todo: Defer loading js/css until we're loading the organize dialog as <script> and
-      // <link> elements so that we're not forcing them to be downloaded on every page view (which
-      // is expensive in terms of browser latency).  When we do that, we'll have to figure out an
-      // approach that lets us continue to use the Kohana cascading filesystem.
-      $theme->script("organize.js");
-      $theme->css("organize.css");
       $theme->css("organize_theme.css");
     }
   }