Renamed Zepto\Zepto->container['file_loader'] to content_loader

hassankhan · Feb 3, 2014 · a676222 · a676222
1 parent 0033a8f
commit a676222
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/library/Zepto/Zepto.php b/library/Zepto/Zepto.php
@@ -101,7 +101,7 @@ function() {
             }
         );
 
-        $container['file_loader'] = $container->share(
+        $container['content_loader'] = $container->share(
             function() {
                 return new FileLoader\MarkdownLoader(new \Michelf\MarkdownExtra);
             }
@@ -219,19 +219,19 @@ protected function load_content()
     {
         // Get local reference to file loader
         $container   = $this->container;
-        $file_loader = $container['file_loader'];
+        $content_loader = $container['content_loader'];
         $settings    = $container['settings']['zepto'];
 
         $content_dir = $settings['content_dir'];
         $this->run_hooks('before_content_load', array(&$content_dir));
 
-        $content = $file_loader->load(
+        $content = $content_loader->load(
             $content_dir,
             $settings['content_ext']
         );
 
         // Could add a hook here maybe?
-        $container['folder_structure'] = $file_loader->get_directory_map($content_dir);
+        $container['folder_structure'] = $content_loader->get_directory_map($content_dir);
 
         $this->run_hooks('after_content_load', array(&$content));
         $container['content'] = $content;
@@ -316,13 +316,13 @@ protected function generate_nav_html()
     {
         $container    = $this->container;
         $settings     = $container['settings'];
-        $file_loader  = $container['file_loader'];
+        $content_loader  = $container['content_loader'];
 
         // Opening ``<ul>`` tag and adding class name
         $nav_html     = sprintf('<ul class="%s">' . PHP_EOL, $settings['site']['nav']['class']);
 
         // Could add a hook here maybe?
-        $structure    = $file_loader->get_directory_map($settings['zepto']['content_dir']);
+        $structure    = $content_loader->get_directory_map($settings['zepto']['content_dir']);
 
         // Remove 'index' along with any file extensions from URL
         $filth = array_merge(array('index'), $settings['zepto']['content_ext']);