joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

Fixed the links of folders in libraries, added another note to libraries, started with linked to ajax functions.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-12-17 11:07:51 +02:00
parent e44b6bc272
commit 26050c771a
15 changed files with 182 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/helpers/compiler/e_Interpretation.php
View File

@@ -3341,7 +3341,7 @@ class Interpretation extends Fields
// add script to file
$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###'] = $view['settings']->javascript_file;
// add script to view
return PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path);
return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path);
}
return '';
}
@@ -3563,7 +3563,7 @@ class Interpretation extends Fields
// Start script builder for library files
if (!isset($this->libwarning[$id]))
{
$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, will only be ready in the next update to v2.6.7', $this->libraries[$id]->name), 'warning');
$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, sorry!', $this->libraries[$id]->name), 'warning');
// set the warning only once
$this->libwarning[$id] = true;
}

10
admin/helpers/componentbuilder.php
View File

@@ -391,8 +391,12 @@ abstract class ComponentbuilderHelper
// load document script
$files[md5($url['path'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL');
}
// load url also if not building document
$files[md5($url['url'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK');
// check if link must be added
if (isset($url['url']) && ((isset($url['type']) && $url['type'] == 1) || (isset($url['type']) && $url['type'] == 3) || !isset($url['type'])))
{
// load url also if not building document
$files[md5($url['url'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK');
}
}
}
}
@@ -475,7 +479,7 @@ abstract class ComponentbuilderHelper
// load per path
foreach($paths as $path)
{
$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path);
$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path) . ' - ' . basename($root);
}
}
}