Merge pull request joomla#82 from dgt41/patch-1

Remove mootools
richard67 · May 5, 2015 · 9e5c274 · 9e5c274
2 parents ad53289 + aab3a6e
commit 9e5c274
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@@ -8,8 +8,7 @@
 
 /** @type  \PatchTester\View\Pulls\PullsHtmlView  $this */
 
-\JHtml::_('behavior.tooltip');
-\JHtml::_('behavior.modal');
+\JHtml::_('bootstrap.tooltip');
 \JHtml::_('formbehavior.chosen', 'select');
 
 \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true);
@@ -22,27 +21,28 @@
 if (count($this->envErrors)) :
 	$this->loadTemplate('errors');
 else :
-?>
-<script type="text/javascript">
+\JFactory::getDocument()->addScriptDeclaration(
+	"
 	var submitpatch = function (task, id) {
-		document.id('pull_id').set('value', id);
+		document.getElementById('pull_id').set('value', id);
 		return Joomla.submitbutton(task);
 	}
 
 	Joomla.orderTable = function() {
 		table = document.getElementById('sortTable');
 		direction = document.getElementById('directionTable');
 		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $listOrder; ?>') {
+		if (order != '" . $listOrder . "') {
 			dirn = 'asc';
 		} else {
 			dirn = direction.options[direction.selectedIndex].value;
 		}
 
 		Joomla.tableOrdering(order, dirn, '');
 	}
-</script>
-
+	"
+);
+?>
 <form action="<?php echo \JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-main-container">
 		<div id="filter-bar" class="btn-toolbar">

diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
@@ -20,7 +20,7 @@
 		<?php echo $item->pull_id; ?>
 	</td>
 	<td>
-		<span class="hasTip" title="<strong>Info</strong><br/><?php echo $this->escape(\JHtml::_('string.truncateComplex', $item->description, 50)); ?>"><?php echo $this->escape($item->title); ?></span>
+		<span class="hasTooltip" title="<strong>Info</strong><br/><?php echo $this->escape(\JHtml::_('string.truncateComplex', $item->description, 50)); ?>"><?php echo $this->escape($item->title); ?></span>
 	</td>
 	<td class="center">
 		<a class="btn btn-small btn-info" href="<?php echo $item->pull_url; ?>" target="_blank">