diff options
248 files changed, 6 insertions, 1195 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index c47fd385b4..2ce0432fc0 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -58,7 +58,6 @@ log_only_when_debug_parameter = 0 ; if configured to log in a file, log entries will be made to this file logger_file_path = tmp/logs/piwik.log - [Debug] ; if set to 1, the archiving process will always be triggered, even if the archive has already been computed ; this is useful when making changes to the archiving code so we can force the archiving process @@ -455,7 +454,6 @@ enable_auto_update = 1 ; If set to 0 it also disables the "sent plugin update emails" feature in general and the related setting in the UI. enable_update_communication = 1 - [Tracker] ; Piwik uses first party cookies by default. If set to 1, ; the visit ID cookie will be set on the Piwik server domain as well @@ -558,7 +556,6 @@ referrer_urls_spam = "semalt.com" ; DO NOT USE THIS SETTING ON PUBLIC PIWIK SERVERS tracking_requests_require_authentication = 1 - [Segments] ; Reports with segmentation in API requests are processed in real time. ; On high traffic websites it is recommended to pre-process the data diff --git a/core/Access.php b/core/Access.php index bd3dbbb6a1..00093e6e4f 100644 --- a/core/Access.php +++ b/core/Access.php @@ -289,7 +289,6 @@ class Access ); } - /** * Returns an array of ID sites for which the user has a VIEW access only. * diff --git a/core/AssetManager/UIAsset/InMemoryUIAsset.php b/core/AssetManager/UIAsset/InMemoryUIAsset.php index f3e3d47b6e..961537a384 100644 --- a/core/AssetManager/UIAsset/InMemoryUIAsset.php +++ b/core/AssetManager/UIAsset/InMemoryUIAsset.php @@ -45,7 +45,6 @@ class InMemoryUIAsset extends UIAsset return false; } - public function writeContent($content) { $this->content = $content; diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php index ad8bbb61a9..5f738092cc 100644 --- a/core/AssetManager/UIAssetMinifier.php +++ b/core/AssetManager/UIAssetMinifier.php @@ -23,7 +23,6 @@ class UIAssetMinifier extends Singleton parent::__construct(); } - /** * Indicates if the provided JavaScript content has already been minified or not. * The heuristic is based on a custom ratio : (size of file) / (number of lines). diff --git a/core/CliMulti.php b/core/CliMulti.php index f8b855d774..ac826c6ea2 100644 --- a/core/CliMulti.php +++ b/core/CliMulti.php @@ -211,7 +211,6 @@ class CliMulti { return SettingsPiwik::rewriteTmpPathWithInstanceId($dir); } - private function executeAsyncCli($url, Output $output, $cmdId) { $this->processes[] = new Process($cmdId); diff --git a/core/Config.php b/core/Config.php index f71baa710a..8183b3fdc2 100644 --- a/core/Config.php +++ b/core/Config.php @@ -637,7 +637,6 @@ class Config extends Singleton return false; } - /** * Write user configuration file * diff --git a/core/CronArchive.php b/core/CronArchive.php index 1549392876..b6a3dffdb0 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -689,7 +689,6 @@ class CronArchive $date = $this->getApiDateParameter($idSite, $period, $lastTimestampWebsiteProcessed); $url .= $this->getVisitsRequestUrl($idSite, $period, $date); - $url .= self::APPEND_TO_API_REQUEST; $visitsInLastPeriods = $visitsLastPeriod = 0; diff --git a/core/DataAccess/ArchivePurger.php b/core/DataAccess/ArchivePurger.php index ffb00905cf..e0f94409a1 100644 --- a/core/DataAccess/ArchivePurger.php +++ b/core/DataAccess/ArchivePurger.php @@ -93,5 +93,4 @@ class ArchivePurger } - } diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php index ea406dafaf..fde4431d54 100644 --- a/core/DataAccess/ArchiveSelector.php +++ b/core/DataAccess/ArchiveSelector.php @@ -294,5 +294,4 @@ class ArchiveSelector " value = '" . ArchiveWriter::DONE_OK_TEMPORARY . "'))"; } - } diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php index f8f69c8540..f171ab40a4 100644 --- a/core/DataFiles/SearchEngines.php +++ b/core/DataFiles/SearchEngines.php @@ -456,7 +456,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'image.search.smt.docomo.ne.jp' => array('Google', 'MT'), 'gfsoso.com' => array('Google', 'q'), - // Google Earth // - 2010-09-13: are these redirects now? 'www.googleearth.de' => array('Google'), @@ -703,7 +702,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'search.myway.com' => array('MyWebSearch'), 'search.mywebsearch.com' => array('MyWebSearch'), - // Najdi 'www.najdi.si' => array('Najdi.si', 'q', 'search.jsp?q={k}'), @@ -982,7 +980,6 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'video.search.yahoo.co.jp' => array('Yahoo! Japan Videos', 'p', 'search?p={k}'), 'image.search.yahoo.co.jp' => array('Yahoo! Japan Images', 'p', 'search?p={k}'), - // Yahoo 'search.yahoo.com' => array('Yahoo!', array('p', 'q'), 'search?p={k}'), // '*.search.yahoo.com' => array('Yahoo!'), // see built-in helper in Common.php diff --git a/core/DataTable/Renderer/Tsv.php b/core/DataTable/Renderer/Tsv.php index 79a8cd6a23..cfffbf24a0 100644 --- a/core/DataTable/Renderer/Tsv.php +++ b/core/DataTable/Renderer/Tsv.php @@ -8,7 +8,6 @@ */ namespace Piwik\DataTable\Renderer; - /** * TSV export * diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index 055aa673da..a18e475d04 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -370,7 +370,6 @@ class Xml extends Renderer continue; } - // Handing case idgoal=7, creating a new array for that one $rowAttribute = ''; if (strstr($rowId, '=') !== false) { diff --git a/core/DataTable/TableNotFoundException.php b/core/DataTable/TableNotFoundException.php index e722d96b55..a8e181deaf 100644 --- a/core/DataTable/TableNotFoundException.php +++ b/core/DataTable/TableNotFoundException.php @@ -8,7 +8,6 @@ */ namespace Piwik\DataTable; - class TableNotFoundException extends \Exception { diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php index 4df8cb403e..6bafa3a653 100644 --- a/core/Db/Adapter.php +++ b/core/Db/Adapter.php @@ -8,7 +8,6 @@ */ namespace Piwik\Db; - use Piwik\Loader; use Zend_Db_Table; diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index 6dd02d5ee6..858dad4e38 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -205,7 +205,6 @@ class BatchInsert return false; } - /** * Create CSV (or other delimited) files * diff --git a/core/Db/Schema.php b/core/Db/Schema.php index c54389fd75..e210de5835 100644 --- a/core/Db/Schema.php +++ b/core/Db/Schema.php @@ -29,7 +29,6 @@ class Schema extends Singleton */ private $schema = null; - /** * Get schema class name * diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 6b04fa1f40..43a42f167d 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -132,7 +132,6 @@ class Mysql implements SchemaInterface ) ENGINE=$engine DEFAULT CHARSET=utf8 ", - 'log_action' => "CREATE TABLE {$prefixTables}log_action ( idaction INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT, name TEXT, diff --git a/core/DeviceDetectorCache.php b/core/DeviceDetectorCache.php index 70a6f68bb7..2c637aa95e 100644 --- a/core/DeviceDetectorCache.php +++ b/core/DeviceDetectorCache.php @@ -41,7 +41,6 @@ class DeviceDetectorCache extends CacheFile implements \DeviceDetector\Cache\Cac return parent::get($id); } - /** * A function to store content a cache entry. * diff --git a/core/Filechecks.php b/core/Filechecks.php index ab25ae7d9d..33d0ed0696 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -117,7 +117,6 @@ class Filechecks $manifest = PIWIK_INCLUDE_PATH . '/config/manifest.inc.php'; - if (file_exists($manifest)) { require_once $manifest; } diff --git a/core/Log.php b/core/Log.php index db3961923d..4e505f7b63 100644 --- a/core/Log.php +++ b/core/Log.php @@ -365,7 +365,6 @@ class Log extends Singleton $this->currentLogLevel = $logLevel; } - public function getLogLevel() { return $this->currentLogLevel; diff --git a/core/Menu/MenuMain.php b/core/Menu/MenuMain.php index aed7760752..5f27f3229e 100644 --- a/core/Menu/MenuMain.php +++ b/core/Menu/MenuMain.php @@ -8,7 +8,6 @@ */ namespace Piwik\Menu; - /** * @deprecated since 2.4.0 * @see MenuReporting diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php index 86fc1ab0c6..55c09c57af 100644 --- a/core/Menu/MenuTop.php +++ b/core/Menu/MenuTop.php @@ -9,7 +9,6 @@ namespace Piwik\Menu; use Piwik\Piwik; - /** * Contains menu entries for the Top menu (the menu at the very top of the page). * Plugins can implement the `configureTopMenu()` method of the `Menu` plugin class to add, rename of remove diff --git a/core/Metrics.php b/core/Metrics.php index 8ac04a9a39..4af30600d3 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -8,7 +8,6 @@ */ namespace Piwik; - use Piwik\Cache\LanguageAwareStaticCache; use Piwik\Cache\PluginAwareStaticCache; diff --git a/core/Period.php b/core/Period.php index bff447dc5e..868ead7f13 100644 --- a/core/Period.php +++ b/core/Period.php @@ -92,7 +92,6 @@ abstract class Period && $period != 'range'; } - /** * Returns the first day of the period. * diff --git a/core/Period/Factory.php b/core/Period/Factory.php index abf4c9aed0..b490956531 100644 --- a/core/Period/Factory.php +++ b/core/Period/Factory.php @@ -39,7 +39,6 @@ class Factory $date = Date::factory($date); } - switch ($period) { case 'day': return new Day($date); @@ -78,7 +77,6 @@ class Factory throw new Exception($message); } - /** * Creates a Period instance using a period, date and timezone. * diff --git a/core/Period/Week.php b/core/Period/Week.php index 80aba977c1..f7b7264943 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -8,7 +8,6 @@ */ namespace Piwik\Period; - use Piwik\Period; use Piwik\Piwik; diff --git a/core/Piwik.php b/core/Piwik.php index c723c541ca..4c4f6fba74 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -381,7 +381,6 @@ class Piwik return false; } - /** * Returns true if the current user has Super User access. * @@ -743,7 +742,6 @@ class Piwik return false; } - /** * Returns the class name of an object without its namespace. * @@ -757,7 +755,6 @@ class Piwik return end($parts); } - /** * Post an event to Piwik's event dispatcher which will execute the event's observers. * diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 994aabc6e7..baf63c5cb2 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -562,7 +562,6 @@ class Manager extends Singleton return $plugins; } - protected static function isManifestFileFound($path) { return file_exists($path . "/" . MetadataLoader::PLUGIN_JSON_FILENAME); @@ -602,7 +601,6 @@ class Manager extends Singleton return false; } - /** * Load the specified plugins. * @@ -804,7 +802,6 @@ class Manager extends Singleton return $ignored; } - /** * Returns the name of all plugins found in this Piwik instance * (including those not enabled and themes) @@ -822,7 +819,6 @@ class Manager extends Singleton return $pluginsToLoad; } - /** * Loads the plugin filename and instantiates the plugin with the given name, eg. UserCountry * diff --git a/core/Profiler.php b/core/Profiler.php index 6eeba2c973..e9297464ee 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -8,7 +8,6 @@ */ namespace Piwik; - /** * Class Profiler helps with measuring memory, and profiling the database. * To enable set in your config.ini.php diff --git a/core/ProxyHeaders.php b/core/ProxyHeaders.php index 5cd8e74edd..3cefeb238c 100644 --- a/core/ProxyHeaders.php +++ b/core/ProxyHeaders.php @@ -8,7 +8,6 @@ */ namespace Piwik; - /** * Proxy headers * diff --git a/core/ProxyHttp.php b/core/ProxyHttp.php index ec62eca296..cb1fa654d3 100644 --- a/core/ProxyHttp.php +++ b/core/ProxyHttp.php @@ -193,7 +193,6 @@ class ProxyHttp !empty($autoAppendFile); } - /** * Workaround IE bug when downloading certain document types over SSL and * cache control headers are present, e.g., @@ -220,7 +219,6 @@ class ProxyHttp } } - /** * Set response header, e.g., HTTP/1.0 200 Ok * diff --git a/core/SettingsServer.php b/core/SettingsServer.php index 6c172c3ecf..fc9d5f6bc1 100644 --- a/core/SettingsServer.php +++ b/core/SettingsServer.php @@ -40,7 +40,6 @@ class SettingsServer return !empty($GLOBALS['PIWIK_TRACKER_MODE']); } - /** * Returns `true` if running on Microsoft IIS 7 (or above), `false` if otherwise. * diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php index 602c1987a6..6d94d591a1 100644 --- a/core/TaskScheduler.php +++ b/core/TaskScheduler.php @@ -82,7 +82,6 @@ class TaskScheduler extends Singleton return self::getInstance()->doRunTasks(); } - // for backwards compatibility private function collectTasksRegisteredViaEvent() { diff --git a/core/Tracker.php b/core/Tracker.php index d3c750ac62..7f9304feca 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -890,7 +890,6 @@ class Tracker return $isAuthenticated; } - protected function runScheduledTasksIfAllowed($isAuthenticated) { // Do not run schedule task if we are importing logs @@ -914,5 +913,4 @@ class Tracker return file_get_contents("php://input"); } - } diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php index 2cd5e5f141..78e2d9ee29 100644 --- a/core/Tracker/Db/Mysqli.php +++ b/core/Tracker/Db/Mysqli.php @@ -27,7 +27,6 @@ class Mysqli extends Db protected $charset; protected $activeTransaction = false; - /** * Builds the DB object * diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index c7e55747d3..fbc73381aa 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -828,7 +828,6 @@ class GoalManager return $match; } - /** * @param ConversionDimension[] $dimensions * @param string $hook diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index 083141a249..1d8486eda0 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -63,7 +63,6 @@ class PageUrl return $url; } - /** * Returns the array of parameters names that must be excluded from the Query String in all tracked URLs * @static @@ -96,7 +95,6 @@ class PageUrl return $parametersToExclude; } - /** * Returns true if URL fragments should be removed for a specific site, * false if otherwise. diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php index 979aaf8a5e..6ebc6d60ff 100644 --- a/core/Tracker/TableLogAction.php +++ b/core/Tracker/TableLogAction.php @@ -13,7 +13,6 @@ use Piwik\Common; use Piwik\SegmentExpression; use Piwik\Tracker; - /** * This class is used to query Action IDs from the log_action table. * @@ -176,7 +175,6 @@ class TableLogAction return array($fieldNameToActionId, $fieldNamesToInsert); } - /** * Convert segment expression to an action ID or an SQL expression. * diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php index 755c669e2b..8a2e095d95 100644 --- a/core/Translate/Filter/ByBaseTranslations.php +++ b/core/Translate/Filter/ByBaseTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class ByBaseTranslations extends FilterAbstract diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php index 72f7fd24d4..74be50d26d 100644 --- a/core/Translate/Filter/ByParameterCount.php +++ b/core/Translate/Filter/ByParameterCount.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class ByParameterCount extends FilterAbstract diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php index 3c67f1f50d..75e3e6536f 100644 --- a/core/Translate/Filter/EmptyTranslations.php +++ b/core/Translate/Filter/EmptyTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class EmptyTranslations extends FilterAbstract diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php index 58b7d08471..b7e3d6a54e 100644 --- a/core/Translate/Filter/EncodedEntities.php +++ b/core/Translate/Filter/EncodedEntities.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - use Piwik\Translate; /** diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php index b104b30a1c..61211fc8ab 100644 --- a/core/Translate/Filter/UnnecassaryWhitespaces.php +++ b/core/Translate/Filter/UnnecassaryWhitespaces.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Filter; - /** */ class UnnecassaryWhitespaces extends FilterAbstract diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php index 68de662f23..9fbfc39b8d 100644 --- a/core/Translate/Validate/CoreTranslations.php +++ b/core/Translate/Validate/CoreTranslations.php @@ -9,7 +9,6 @@ namespace Piwik\Translate\Validate; - use Piwik\Common; /** diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php index 391decdc89..617b8b9552 100644 --- a/core/Translate/Writer.php +++ b/core/Translate/Writer.php @@ -207,7 +207,6 @@ class Writer return sprintf('%s/%s/%s.json', PIWIK_INCLUDE_PATH, $base, $lang); } - /** * Converts translations to a string that can be written to a file * diff --git a/core/Unzip/Gzip.php b/core/Unzip/Gzip.php index aa7d07f315..16f08abf0a 100755 --- a/core/Unzip/Gzip.php +++ b/core/Unzip/Gzip.php @@ -9,7 +9,6 @@ namespace Piwik\Unzip; - /** * Unzip implementation for .gz files. * diff --git a/core/Unzip/PclZip.php b/core/Unzip/PclZip.php index 4d0ce536a9..b0ce4b3a75 100644 --- a/core/Unzip/PclZip.php +++ b/core/Unzip/PclZip.php @@ -8,7 +8,6 @@ */ namespace Piwik\Unzip; - /** * @see libs/PclZip */ diff --git a/core/Updates/1.2.5-rc7.php b/core/Updates/1.2.5-rc7.php index 94671da038..85ce3792f1 100644 --- a/core/Updates/1.2.5-rc7.php +++ b/core/Updates/1.2.5-rc7.php @@ -31,4 +31,3 @@ class Updates_1_2_5_rc7 extends Updates } } - diff --git a/core/Updates/1.5-b1.php b/core/Updates/1.5-b1.php index 4157a8c115..9661fe3213 100644 --- a/core/Updates/1.5-b1.php +++ b/core/Updates/1.5-b1.php @@ -9,7 +9,6 @@ namespace Piwik\Updates; - use Piwik\Common; use Piwik\Updater; use Piwik\Updates; diff --git a/core/Updates/1.9-b16.php b/core/Updates/1.9-b16.php index ceded83024..d6b1c04a09 100755 --- a/core/Updates/1.9-b16.php +++ b/core/Updates/1.9-b16.php @@ -29,7 +29,6 @@ class Updates_1_9_b16 extends Updates CHANGE `idaction_url` `idaction_url` INT( 10 ) UNSIGNED NULL DEFAULT NULL' => false, - 'ALTER TABLE `' . Common::prefixTable('log_visit') . '` ADD visit_total_searches SMALLINT(5) UNSIGNED NOT NULL AFTER `visit_total_actions`' => 1060, diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php index da223fabb6..87d46f856a 100755 --- a/core/Updates/1.9-b19.php +++ b/core/Updates/1.9-b19.php @@ -33,7 +33,6 @@ class Updates_1_9_b19 extends Updates { Updater::updateDatabase(__FILE__, self::getSql()); - try { \Piwik\Plugin\Manager::getInstance()->activatePlugin('Transitions'); } catch (\Exception $e) { diff --git a/core/Updates/2.3.0-rc2.php b/core/Updates/2.3.0-rc2.php index 55219b4f92..052a314a86 100644 --- a/core/Updates/2.3.0-rc2.php +++ b/core/Updates/2.3.0-rc2.php @@ -22,5 +22,4 @@ class Updates_2_3_0_rc2 extends Updates ServerFilesGenerator::createHtAccessFiles(); } - } diff --git a/core/UrlHelper.php b/core/UrlHelper.php index 485b5ec7bf..70807a8601 100644 --- a/core/UrlHelper.php +++ b/core/UrlHelper.php @@ -234,7 +234,6 @@ class UrlHelper return $result; } - /** * Extracts a keyword from a raw not encoded URL. * Will only extract keyword if a known search engine has been detected. diff --git a/js/piwik.js b/js/piwik.js index 975ad1b9cd..7cf22eb5d0 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -1222,7 +1222,6 @@ if (typeof Piwik !== 'object') { // Visitor UUID visitorUUID; - /* * Set cookie value */ @@ -1694,7 +1693,6 @@ if (typeof Piwik !== 'object') { lastVisitTs = currentVisitTs; } - // Detect the campaign information from the current URL // Only if campaign wasn't previously set // Or if it was set but we must attribute to the most recent one @@ -1766,7 +1764,6 @@ if (typeof Piwik !== 'object') { (String(referralUrl).length ? '&_ref=' + encodeWrapper(purify(referralUrl.slice(0, referralUrlMaxLength))) : '') + (charSet ? '&cs=' + encodeWrapper(charSet) : ''); - // browser features for (i in browserFeatures) { if (Object.prototype.hasOwnProperty.call(browserFeatures, i)) { @@ -3053,7 +3050,6 @@ if (typeof Piwik !== 'object') { }); }, - /** * Used to record that the current page view is an item (product) page view, or a Ecommerce Category page view. * This must be called before trackPageView() on the product/category page. diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md index fe7c963fa2..7842da798a 100644 --- a/misc/log-analytics/README.md +++ b/misc/log-analytics/README.md @@ -59,7 +59,6 @@ To improve performance, you can disable server access logging for these requests. Each Piwik webserver (Apache, Nginx, IIS) can also be tweaked a bit to handle more req/sec. - ## Setup Apache CustomLog that directly imports in Piwik Since apache CustomLog directives can send log data to a script, it is possible to import hits into piwik server-side in real-time rather than processing a logfile each day. @@ -90,7 +89,6 @@ Useful options here are: You can have as many CustomLog statements as you like. However, if you define any CustomLog directives within a <VirtualHost> block, all CustomLogs in the main config will be overridden. Therefore if you require custom logging for particular VirtualHosts, it is recommended to use mod_macro to make configuration more maintainable. - ## Advanced Log Analytics use case: Apache vhost, custom logs, automatic website creation As a rather extreme example of what you can do, here is an apache config with: @@ -177,7 +175,6 @@ This log format can be specified for nginx access logs to capture multiple virtu When executing import_logs.py specify the "common_complete" format. - ## Import Page Speed Metric from logs In Piwik> Actions> Page URLs and Page Title reports, Piwik reports the Avg. generation time, as an indicator of your website speed. @@ -193,7 +190,6 @@ Apache LogFormat "%h %l %u %t \"%r\" %>s %b %D" Note: the group <generation_time_milli> is also available if your server logs generation time in milliseconds rather than microseconds. - ## Setup Nginx to directly imports in Piwik via syslog With the syslog patch from http://wiki.nginx.org/3rdPartyModules which is compiled in dotdeb's release, you can log to syslog and imports them live to Piwik. @@ -201,7 +197,6 @@ Path: Nginx -> syslog -> (syslog central server) -> this script -> piwik You can use any log format that this script can handle, like Apache Combined, and Json format which needs less processing. - ### Setup Nginx logs ``` @@ -254,7 +249,5 @@ exec python /path/to/misc/log-analytics/import_logs.py \ --log-format-name=nginx_json - ``` - And that's all ! - diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 90366304be..8b20cfe994 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -55,7 +55,6 @@ except ImportError: except ImportError: pass - ## ## Constants. ## @@ -64,7 +63,6 @@ STATIC_EXTENSIONS = set(( 'gif jpg jpeg png bmp ico svg ttf eot woff class swf css js xml robots.txt' ).split()) - DOWNLOAD_EXTENSIONS = set(( '7z aac arc arj asf asx avi bin csv deb dmg doc exe flv gz gzip hqx ' 'jar mpg mp2 mp3 mp4 mpeg mov movie msi msp odb odf odg odp ' @@ -73,7 +71,6 @@ DOWNLOAD_EXTENSIONS = set(( 'azw3 epub mobi' ).split()) - # A good source is: http://phpbb-bots.blogspot.com/ EXCLUDED_USER_AGENTS = ( 'adsbot-google', @@ -104,7 +101,6 @@ EXCLUDED_USER_AGENTS = ( 'yandex', ) - PIWIK_MAX_ATTEMPTS = 3 PIWIK_DELAY_AFTER_FAILURE = 2 @@ -112,8 +108,6 @@ PIWIK_EXPECTED_IMAGE = base64.b64decode( 'R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==' ) - - ## ## Formats. ## @@ -134,7 +128,6 @@ class BaseFormat(object): def check_format_line(self, line): return False - class JsonFormat(BaseFormat): def __init__(self, name): super(JsonFormat, self).__init__(name) @@ -174,8 +167,6 @@ class JsonFormat(BaseFormat): def get_all(self,): return self.json - - class RegexFormat(BaseFormat): def __init__(self, name, regex, date_format=None): @@ -202,9 +193,6 @@ class RegexFormat(BaseFormat): def get_all(self,): return self.matched.groupdict() - - - class IisFormat(RegexFormat): def __init__(self): @@ -248,8 +236,6 @@ class IisFormat(RegexFormat): file.seek(start_pos) return self.check_format_line(nextline) - - _HOST_PREFIX = '(?P<host>[\w\-\.]*)(?::\d+)? ' _COMMON_LOG_FORMAT = ( '(?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] ' @@ -278,14 +264,10 @@ FORMATS = { 'nginx_json': JsonFormat('nginx_json'), } - - - ## ## Code. ## - class Configuration(object): """ Stores all the configuration options by reading sys.argv and parsing, @@ -507,7 +489,6 @@ class Configuration(object): ) return option_parser - def _parse_args(self, option_parser): """ Parse the command line args and create self.options and self.filenames. @@ -575,11 +556,9 @@ class Configuration(object): if self.options.recorders < 1: self.options.recorders = 1 - def __init__(self): self._parse_args(self._create_parser()) - def _get_token_auth(self): """ If the token auth is not specified in the options, get it from Piwik. @@ -644,7 +623,6 @@ class Configuration(object): except: fatal_error("We couldn't detect PHP. You can run the importer using the --login and --password option to fix this issue") - command = [phpBinary, updatetokenfile] if self.options.enable_testmode: command.append('--testmode') @@ -655,13 +633,11 @@ class Configuration(object): if process.returncode != 0: fatal_error("`" + command + "` failed with error: " + stderr + ".\nReponse code was: " + str(process.returncode) + ". You can alternatively run the importer using the --login and --password option") - filename = stdout credentials = open(filename, 'r').readline() credentials = credentials.split('\t') return credentials[1] - def get_resolver(self): if self.options.site_id: logging.debug('Resolver: static') @@ -670,8 +646,6 @@ class Configuration(object): logging.debug('Resolver: dynamic') return DynamicResolver() - - class Statistics(object): """ Store statistics about parsed logs and recorded entries. @@ -699,7 +673,6 @@ class Statistics(object): def __str__(self): return str(int(self.value)) - def __init__(self): self.time_start = None self.time_stop = None @@ -732,7 +705,6 @@ class Statistics(object): self.dates_recorded = set() self.monitor_stop = False - def set_time_start(self): self.time_start = time.time() @@ -848,7 +820,6 @@ Performance summary )), } - ## ## The monitor is a thread that prints a short summary each second. ## @@ -875,8 +846,6 @@ Performance summary def stop_monitor(self): self.monitor_stop = True - - class Piwik(object): """ Make requests to Piwik. @@ -950,7 +919,6 @@ class Piwik(object): truncate_after = 4000 raise urllib2.URLError('Piwik returned an invalid response: ' + res[:truncate_after]) - @staticmethod def _call_wrapper(func, expected_response, on_failure, *args, **kwargs): """ @@ -994,7 +962,6 @@ class Piwik(object): def call_api(cls, method, **kwargs): return cls._call_wrapper(cls._call_api, None, None, method, **kwargs) - ## ## Resolvers. ## @@ -1033,7 +1000,6 @@ class StaticResolver(object): def check_format(self, format): pass - class DynamicResolver(object): """ Use Piwik API to determine the site ID. @@ -1144,7 +1110,6 @@ class DynamicResolver(object): else: return self._resolve_by_host(hit) - def check_format(self, format): if config.options.replay_tracking: pass @@ -1154,9 +1119,6 @@ class DynamicResolver(object): "specify the Piwik site ID with the --idsite argument" ) - - - class Recorder(object): """ A Recorder fetches hits from the Queue and inserts them into Piwik using @@ -1374,7 +1336,6 @@ class Recorder(object): '$ /path/to/piwik/console core:archive --url=http://example/piwik/\n' '\nReference: http://piwik.org/docs/setup-auto-archiving/ ') - class Hit(object): """ It's a simple container. @@ -1387,7 +1348,6 @@ class Hit(object): if config.options.force_lowercase_path: self.full_path = self.full_path.lower() - class Parser(object): """ The Parser parses the lines in a specified file and inserts them into @@ -1399,7 +1359,6 @@ class Parser(object): in inspect.getmembers(self, predicate=inspect.ismethod) if name.startswith('check_')] - ## All check_* methods are called for each hit and must return True if the ## hit can be imported, False otherwise. @@ -1741,9 +1700,6 @@ class Parser(object): if len(hits) > 0: Recorder.add_hits(hits) - - - def main(): """ Start the importing process. @@ -1774,8 +1730,6 @@ def main(): pass stats.print_summary() - - def fatal_error(error, filename=None, lineno=None): print >> sys.stderr, 'Fatal error: %s' % error if filename and lineno is not None: @@ -1785,7 +1739,6 @@ def fatal_error(error, filename=None, lineno=None): ) os._exit(1) - if __name__ == '__main__': try: piwik = Piwik() diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 5d42e51797..163c100d3a 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -44,7 +44,6 @@ def test_format_detection(): f.description = 'Testing autodetection of format ' + format_name + ' w/ garbage at end of line' yield f - class Options(object): """Mock config options necessary to run checkers from Parser class.""" debug = False @@ -65,19 +64,16 @@ class Options(object): included_paths = [] enable_http_errors = False - class Config(object): """Mock configuration.""" options = Options() format = import_logs.FORMATS['ncsa_extended'] - class Resolver(object): """Mock resolver which doesn't check connection to real piwik.""" def check_format(self, format_): pass - class Recorder(object): """Mock recorder which collects hits but doesn't put their in database.""" recorders = [] diff --git a/misc/others/download-count.txt b/misc/others/download-count.txt index 924d71ec38..3be6964b6f 100644 --- a/misc/others/download-count.txt +++ b/misc/others/download-count.txt @@ -2,10 +2,8 @@ Count the download for 'latest.zip' on the 20th March # cat access.log | grep "20/Mar" | grep "latest.zip" | awk '{print $1}' | sort | uniq | wc -l - Value to be compared with the one given by Piwik in Actions > Downloads - Count the no of hits by referrers, excluding piwik.org as a referer # cat /var/log/apache2/access.log | awk '{print $11}' | grep -vE "(^"-"$|/dev.piwik.org|/piwik.org)" | sort | uniq -c | sort -rn | head -n20 diff --git a/misc/package/build.sh b/misc/package/build.sh index 35b230f47a..5e5c3a944e 100755 --- a/misc/package/build.sh +++ b/misc/package/build.sh @@ -92,7 +92,6 @@ if [ -z "$VERSION" ]; then die "Expected a version number as a parameter" fi - # Fail script, if Piwik has already been built, to prevent re-building a given release destination=$HTTP_PATH/piwik-$VERSION.zip if [ -f "$destination" ] @@ -215,6 +214,5 @@ Piwik team" | mail -s"New Piwik Version $VERSION" "appgal@microsoft.com,hello@pi echo "build finished! http://builds.piwik.org/piwik.zip" fi - cleanupWorkspace diff --git a/misc/proxy-hide-piwik-url/piwik.php b/misc/proxy-hide-piwik-url/piwik.php index 7ec88affd6..846a82313b 100644 --- a/misc/proxy-hide-piwik-url/piwik.php +++ b/misc/proxy-hide-piwik-url/piwik.php @@ -24,7 +24,6 @@ $TOKEN_AUTH = 'xyz'; // Maximum time, in seconds, to wait for the Piwik server to return the 1*1 GIF $timeout = 5; - // DO NOT MODIFY BELOW // --------------------------- // 1) PIWIK.JS PROXY: No _GET parameter, we serve the JS file diff --git a/plugins/API/API.php b/plugins/API/API.php index 9ce0742a25..91ab8e4d19 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -223,7 +223,6 @@ class API extends \Piwik\Plugin\API return $compare; } - /** * Returns the url to application logo (~280x110px) * @@ -261,7 +260,6 @@ class API extends \Piwik\Plugin\API return $logo->getSVGLogoUrl($pathOnly); } - /** * Returns whether there is an SVG Logo available. * @ignore @@ -273,7 +271,6 @@ class API extends \Piwik\Plugin\API return $logo->hasSVGLogo(); } - /** * Loads reports metadata, then return the requested one, * matching optional API parameters. diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 23d1bf9af9..e4cf96174c 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -15,7 +15,6 @@ <p>{{ 'API_PluginDescription'|translate }}</p> - <p> <strong>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}</strong> </p> diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 3407c7f8e2..f27e6b663c 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -164,6 +164,5 @@ class Actions extends \Piwik\Plugin } } - } diff --git a/plugins/Actions/Actions/ActionSiteSearch.php b/plugins/Actions/Actions/ActionSiteSearch.php index 275adb83b2..9631aa0473 100644 --- a/plugins/Actions/Actions/ActionSiteSearch.php +++ b/plugins/Actions/Actions/ActionSiteSearch.php @@ -262,5 +262,4 @@ class ActionSiteSearch extends Action ); } - } diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 30146cbac3..14d4214744 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -461,7 +461,6 @@ class Archiver extends \Piwik\Plugin\Archiver $this->getProcessor()->insertBlobRecord($recordName, $report); } - protected function insertDownloadsReports() { $dataTable = $this->getDataTable(Action::TYPE_DOWNLOAD); diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 86e035f458..693b1328b4 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -402,7 +402,6 @@ class ArchivingHelper return self::$defaultActionUrlWhenNotDefined; } - /** * Explodes action name into an array of elements. * diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index f1f0f5f1bd..0722b45a8e 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -351,5 +351,4 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $view->enableSendPluginUpdateCommunication = $pluginUpdateCommunication->isEnabled(); } - } diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 8edbb14cf4..1a1854339e 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -267,7 +267,6 @@ |translate("<strong>"~pathUserLogoDirectory~"</strong><br/>", pathUserLogo ~", "~ pathUserLogoSmall ~", "~ pathUserLogoSVG ~"") |notification({'placeAt': '#CoreAdminHome_LogoNotWriteable', 'noclear': true, 'context': 'warning', 'raw': true}) }} - </div> </td> </tr> @@ -280,7 +279,6 @@ |translate("file_uploads=1") |notification({'placeAt': '#CoreAdminHome_FileUploadDisabled', 'noclear': true, 'context': 'warning', 'raw': true}) }} - </div> </td> </tr> diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 539159bec4..d00c16a83f 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\CoreConsole\Commands; - use Piwik\Filesystem; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputInterface; diff --git a/plugins/CoreConsole/Commands/GeneratePluginBase.php b/plugins/CoreConsole/Commands/GeneratePluginBase.php index d96051e88c..689fe640ec 100644 --- a/plugins/CoreConsole/Commands/GeneratePluginBase.php +++ b/plugins/CoreConsole/Commands/GeneratePluginBase.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\CoreConsole\Commands; - use Piwik\Development; use Piwik\Filesystem; use Piwik\Plugin\ConsoleCommand; diff --git a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php index 8d732e9ffb..90b6585fed 100644 --- a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php +++ b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\CoreConsole\Commands; - use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -91,5 +90,4 @@ class GenerateVisualizationPlugin extends GeneratePlugin return $visualizationName; } - } diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.less b/plugins/CoreHome/angularjs/siteselector/siteselector.less index 4d35bf9e92..42d7f3fafc 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.less @@ -1,5 +1,4 @@ - /*sites_autocomplete*/ .sites_autocomplete { position: absolute; diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js index 8453b81c47..8482cad4fb 100644 --- a/plugins/CoreHome/javascripts/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -551,7 +551,6 @@ var broadcast = { return this.extractKeyValuePairsFromQueryString(searchString); }, - /** * help to get param value for any given url string with provided param name * if no url is provided, it will get param from current address. @@ -584,7 +583,6 @@ var broadcast = { return broadcast.getParamValue(param, hashStr); }, - /** * return value for the requested param, will return the first match. * out side of this class should use getValueFromHash() or getValueFromUrl() instead. diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js index e96e67374c..93ecb553f2 100644 --- a/plugins/CoreHome/javascripts/calendar.js +++ b/plugins/CoreHome/javascripts/calendar.js @@ -484,7 +484,6 @@ $('#calendarTo').datepicker(options).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', piwik.endDateString)); onDateRangeSelect(piwik.endDateString, { "id": "calendarTo" }); - // If not called, the first date appears light brown instead of dark brown $('.ui-state-hover').removeClass('ui-state-hover'); @@ -509,7 +508,6 @@ }) .show(); - // Bind the input fields to update the calendar's date when date is manually changed $('#inputCalendarFrom, #inputCalendarTo') .keyup(function (e) { diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index bc504d00e8..08fe3224e3 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -217,7 +217,6 @@ $.extend(DataTable.prototype, UIControl.prototype, { var container = $('#' + self.workingDivId + ' .piwik-graph'); - var params = {}; for (var key in self.param) { if (typeof self.param[key] != "undefined" && self.param[key] != '') @@ -1010,7 +1009,6 @@ $.extend(DataTable.prototype, UIControl.prototype, { } }); - $('.exportToFormatItems a', domElem) // prevent click jacking attacks by dynamically adding the token auth when the link is clicked .click(function () { @@ -1063,7 +1061,6 @@ $.extend(DataTable.prototype, UIControl.prototype, { + ( typeof self.param.filter_pattern != "undefined" ? '&filter_pattern=' + self.param.filter_pattern : '') + ( typeof self.param.filter_pattern_recursive != "undefined" ? '&filter_pattern_recursive=' + self.param.filter_pattern_recursive : ''); - if (typeof self.param.flat != "undefined") { str += '&flat=' + (self.param.flat == 0 ? '0' : '1'); if (typeof self.param.include_aggregate_rows != "undefined" && self.param.include_aggregate_rows) { diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js index 4d717938ab..3228aa82f1 100644 --- a/plugins/CoreHome/javascripts/dataTable_rowactions.js +++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js @@ -110,7 +110,6 @@ DataTable_RowActions_Registry.register({ }); - /** * DataTable Row Actions * @@ -125,7 +124,6 @@ DataTable_RowActions_Registry.register({ * The two template methods are performAction and doOpenPopover */ - // // BASE CLASS // @@ -249,7 +247,6 @@ DataTable_RowAction.prototype.performAction = function (label, tr, e) { DataTable_RowAction.prototype.doOpenPopover = function (parameter) { }; - // // ROW EVOLUTION // diff --git a/plugins/CoreHome/stylesheets/cloud.less b/plugins/CoreHome/stylesheets/cloud.less index a0750c6497..95eca8f303 100644 --- a/plugins/CoreHome/stylesheets/cloud.less +++ b/plugins/CoreHome/stylesheets/cloud.less @@ -13,7 +13,6 @@ .tagCloud { padding: 10px; - img { border: 0; } diff --git a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less index 4ba2dbc88b..84a875bec7 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less +++ b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less @@ -1,5 +1,4 @@ - table.dataTable .dataTableRowActions { position: absolute; display: none; diff --git a/plugins/CoreHome/stylesheets/menu.less b/plugins/CoreHome/stylesheets/menu.less index 14fb5d4e2c..47ed717c2c 100644 --- a/plugins/CoreHome/stylesheets/menu.less +++ b/plugins/CoreHome/stylesheets/menu.less @@ -69,7 +69,6 @@ background: none; } - .Menu--dashboard > .Menu-tabList > li li { float: left; background: none; @@ -89,7 +88,6 @@ text-decoration: none; } - /* LEVEL2 HOVER */ .Menu--dashboard > .Menu-tabList > li.sfHover ul, .Menu--dashboard > .Menu-tabList > li:hover ul { diff --git a/plugins/CoreHome/stylesheets/zen-mode.less b/plugins/CoreHome/stylesheets/zen-mode.less index 42a166e8f5..3aa99376cf 100644 --- a/plugins/CoreHome/stylesheets/zen-mode.less +++ b/plugins/CoreHome/stylesheets/zen-mode.less @@ -55,7 +55,6 @@ padding: 7px 0; } - .dataTableFooterIcons { border-top: 0px; } diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index 798bfde04d..d67d348c92 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -126,7 +126,6 @@ {% endif %} {% endmacro %} - {% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme, marketplacePluginNames, displayAdminLinks) %} <div id="confirmUninstallPlugin" class="ui-confirm"> diff --git a/plugins/CorePluginsAdmin/templates/pluginOverview.twig b/plugins/CorePluginsAdmin/templates/pluginOverview.twig index cbe4ca5a89..b6a81cd901 100644 --- a/plugins/CorePluginsAdmin/templates/pluginOverview.twig +++ b/plugins/CorePluginsAdmin/templates/pluginOverview.twig @@ -14,7 +14,6 @@ {% endif %} {% endif %} - <h3 class="header" title="{{ 'General_MoreDetails'|translate }}"> <a href="javascript:void(0);" class="more">{{ plugin.name }}</a> </h3> diff --git a/plugins/CorePluginsAdmin/templates/safemode.twig b/plugins/CorePluginsAdmin/templates/safemode.twig index cc80df2d3e..e2608c147e 100644 --- a/plugins/CorePluginsAdmin/templates/safemode.twig +++ b/plugins/CorePluginsAdmin/templates/safemode.twig @@ -55,7 +55,6 @@ </ul> <hr/> - {% endif %} {% if isSuperUser %} @@ -112,7 +111,6 @@ </table> {% endif %} - {% elseif isAnonymousUser %} <p>Please contact the system administrator, or login to Piwik to learn more.</p> diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index c14078e1ad..a78f8667f9 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -134,7 +134,6 @@ class Controller extends \Piwik\Plugin\Controller return $view->render(); } - public function oneClickResults() { $view = new View('@CoreUpdater/oneClickResults'); diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php index fc7cdde8a6..14e796cd0d 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator.php @@ -32,7 +32,6 @@ class JqplotDataGenerator */ protected $properties; - protected $graphType; /** diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php index 0fdaa2c1eb..5675153c34 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\CoreVisualizations\JqplotDataGenerator; - use Piwik\Archive\DataTableFactory; use Piwik\Common; use Piwik\DataTable; diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index 86859d5197..c14eb33863 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -71,7 +71,6 @@ class HtmlTable extends Visualization $this->assignTemplateVar('siteSummary', $dataTable); } - } } diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php index 38b9077470..695015ee7a 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\CoreVisualizations\Visualizations; - use Piwik\DataTable; use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator; use Piwik\View; diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index f7d43f107d..4beff9acab 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -618,7 +618,6 @@ JQPlotExternalSeriesToggle.prototype = { }; - // ROW EVOLUTION SERIES TOGGLE function RowEvolutionSeriesToggle(targetDivId, jqplotData, initiallyShowAll) { @@ -675,7 +674,6 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () { } }; - // ------------------------------------------------------------ // PIWIK TICKS PLUGIN FOR JQPLOT // Handle ticks the piwik way... @@ -835,7 +833,6 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () { })(jQuery); - // ------------------------------------------------------------ // LEGEND PLUGIN FOR JQPLOT // Render legend on canvas @@ -934,7 +931,6 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () { })(jQuery); - // ------------------------------------------------------------ // SERIES PICKER // ------------------------------------------------------------ diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php index 29addaa12d..7ff8889d65 100644 --- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php +++ b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php @@ -48,11 +48,9 @@ class SetNumberOfCustomVariables extends ConsoleCommand return; } - $output->writeln(''); $output->writeln(sprintf('Configuring Piwik for %d custom variables', $numVarsToSet)); - foreach (Model::getScopes() as $scope) { $this->printChanges($scope, $numVarsToSet, $output); } @@ -61,19 +59,16 @@ class SetNumberOfCustomVariables extends ConsoleCommand return; } - $output->writeln(''); $output->writeln('Starting to apply changes'); $output->writeln(''); - $this->progress = $this->initProgress($numChangesToPerform, $output); foreach (Model::getScopes() as $scope) { $this->performChange($scope, $numVarsToSet, $output); } - Cache::clearCacheGeneral(); $this->progress->finish(); diff --git a/plugins/CustomVariables/tests/ModelTest.php b/plugins/CustomVariables/tests/ModelTest.php index 3ad41525ba..bfca81c777 100644 --- a/plugins/CustomVariables/tests/ModelTest.php +++ b/plugins/CustomVariables/tests/ModelTest.php @@ -177,5 +177,4 @@ class ModelTest extends \DatabaseTestCase return new Model(Model::SCOPE_CONVERSION); } - } diff --git a/plugins/DBStats/Reports/GetReportDataSummary.php b/plugins/DBStats/Reports/GetReportDataSummary.php index 35f87df25d..b3383570a8 100644 --- a/plugins/DBStats/Reports/GetReportDataSummary.php +++ b/plugins/DBStats/Reports/GetReportDataSummary.php @@ -31,7 +31,6 @@ class GetReportDataSummary extends Base $view->config->title = $this->name; } - public function getRelatedReports() { return array(new GetReportDataSummaryByYear()); diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index f1f6e3a3bd..5e319ddb25 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -335,4 +335,3 @@ class Controller extends \Piwik\Plugin\Controller } } - diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 106d8e61b9..361f0ef965 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -100,7 +100,6 @@ class API extends \Piwik\Plugin\API return false; } - protected function getRecordNameForAction($apiMethod, $secondaryDimension = false) { if (empty($secondaryDimension)) { diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php index 337dec0a33..02fe3a8d83 100644 --- a/plugins/Events/Archiver.php +++ b/plugins/Events/Archiver.php @@ -182,7 +182,6 @@ class Archiver extends \Piwik\Plugin\Archiver $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery); } - protected function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, RankingQuery $rankingQuery) { // get query with segmentation @@ -205,7 +204,6 @@ class Archiver extends \Piwik\Plugin\Archiver } } - /** * Records the daily datatables */ diff --git a/plugins/ExampleTheme/README.md b/plugins/ExampleTheme/README.md index a0ad81fd8a..8dce581531 100644 --- a/plugins/ExampleTheme/README.md +++ b/plugins/ExampleTheme/README.md @@ -17,5 +17,3 @@ Here goes the changelog text. Please direct any feedback to ... - - diff --git a/plugins/ExampleUI/Menu.php b/plugins/ExampleUI/Menu.php index 182a457dab..8b5f1bcfea 100644 --- a/plugins/ExampleUI/Menu.php +++ b/plugins/ExampleUI/Menu.php @@ -38,7 +38,6 @@ class Menu extends \Piwik\Plugin\Menu $menu->addPlatformItem('UI Notifications', $urlParams, $order = 3); } - private function addSubMenu(MenuReporting $menu, $subMenu, $action, $order) { $menu->add('UI Framework', $subMenu, array('module' => 'ExampleUI', 'action' => $action), true, $order); diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php index 329f4cccc1..7180568089 100644 --- a/plugins/Feedback/Feedback.php +++ b/plugins/Feedback/Feedback.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\Feedback; - /** * */ diff --git a/plugins/Goals/javascripts/goalsForm.js b/plugins/Goals/javascripts/goalsForm.js index db868cc505..7b2d78581b 100644 --- a/plugins/Goals/javascripts/goalsForm.js +++ b/plugins/Goals/javascripts/goalsForm.js @@ -61,7 +61,6 @@ function initGoalForm(goalMethodAPI, submitText, goalName, matchAttribute, patte } } - function bindGoalForm() { $('select[name=trigger_type]').click(function () { var triggerTypeId = $(this).val(); diff --git a/plugins/ImageGraph/StaticGraph/Evolution.php b/plugins/ImageGraph/StaticGraph/Evolution.php index 3bbe6f8f08..0b012fc6e9 100644 --- a/plugins/ImageGraph/StaticGraph/Evolution.php +++ b/plugins/ImageGraph/StaticGraph/Evolution.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\ImageGraph\StaticGraph; - /** * */ diff --git a/plugins/ImageGraph/StaticGraph/HorizontalBar.php b/plugins/ImageGraph/StaticGraph/HorizontalBar.php index e87969eca0..2f6f4b8ca5 100644 --- a/plugins/ImageGraph/StaticGraph/HorizontalBar.php +++ b/plugins/ImageGraph/StaticGraph/HorizontalBar.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\ImageGraph\StaticGraph; use Piwik\Piwik; - /** * */ diff --git a/plugins/ImageGraph/StaticGraph/Pie.php b/plugins/ImageGraph/StaticGraph/Pie.php index 5c97885b45..1b6987fc74 100644 --- a/plugins/ImageGraph/StaticGraph/Pie.php +++ b/plugins/ImageGraph/StaticGraph/Pie.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\ImageGraph\StaticGraph; - /** * */ diff --git a/plugins/ImageGraph/StaticGraph/VerticalBar.php b/plugins/ImageGraph/StaticGraph/VerticalBar.php index 06a0c6444a..375de0e969 100644 --- a/plugins/ImageGraph/StaticGraph/VerticalBar.php +++ b/plugins/ImageGraph/StaticGraph/VerticalBar.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\ImageGraph\StaticGraph; - /** * */ diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/InsightReportTest.php index f5ab3e9306..32901409ac 100644 --- a/plugins/Insights/tests/InsightReportTest.php +++ b/plugins/Insights/tests/InsightReportTest.php @@ -346,7 +346,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(100, $metadata['evolutionDifference']); $this->assertEquals(200, $metadata['evolutionTotal']); - $report = $this->generateMoverAndShaker(75, 50); $metadata = $report->getAllTableMetadata(); @@ -355,7 +354,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(25, $metadata['evolutionDifference']); $this->assertEquals(50, $metadata['evolutionTotal']); - $report = $this->generateMoverAndShaker(25, 50); $metadata = $report->getAllTableMetadata(); @@ -385,7 +383,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(6, $metadata['minNewPercent']); $this->assertEquals(8, $metadata['minDisappearedPercent']); - $report = $this->generateMoverAndShaker(225, 150); $metadata = $report->getAllTableMetadata(); @@ -395,7 +392,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(5, $metadata['minNewPercent']); $this->assertEquals(7, $metadata['minDisappearedPercent']); - $report = $this->generateMoverAndShaker(300, 600); $metadata = $report->getAllTableMetadata(); @@ -405,7 +401,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(5, $metadata['minNewPercent']); $this->assertEquals(7, $metadata['minDisappearedPercent']); - // make sure to force a change of at least 2 visits in all rows if total is soooo low $report = $this->generateMoverAndShaker(25, 50); $metadata = $report->getAllTableMetadata(); @@ -416,7 +411,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(8, $metadata['minNewPercent']); $this->assertEquals(8, $metadata['minDisappearedPercent']); - // make sure to force a change of at least 2 visits $report = $this->generateMoverAndShaker(75, 150); $metadata = $report->getAllTableMetadata(); @@ -427,7 +421,6 @@ class InsightReportTest extends \PHPUnit_Framework_TestCase $this->assertEquals(5, $metadata['minNewPercent']); $this->assertEquals(7, $metadata['minDisappearedPercent']); - // make sure no division by zero issue $report = $this->generateMoverAndShaker(0, 150); $metadata = $report->getAllTableMetadata(); diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index c0e7fd2be1..e79faad1b7 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -549,7 +549,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Piwik::redirectToModule('Installation', $nextStep, $parameters); } - /** * Extract host from URL * @@ -631,7 +630,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $view->problemWithSomeDirectories = (false !== array_search(false, $view->infos['directories'])); } - private function createSuperUser($login, $password, $email) { $this->initObjectsToCallAPI(); diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php index df0c91f081..5ce2abf844 100644 --- a/plugins/Installation/ServerFilesGenerator.php +++ b/plugins/Installation/ServerFilesGenerator.php @@ -202,7 +202,6 @@ class ServerFilesGenerator return $denyAll; } - /** * @return string */ diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php index 69eb888654..5094722d7d 100644 --- a/plugins/Installation/SystemCheck.php +++ b/plugins/Installation/SystemCheck.php @@ -192,7 +192,6 @@ class SystemCheck $infos['is_nfs'] = Filesystem::checkIfFileSystemIsNFS(); $infos = self::enrichSystemChecks($infos); - return $infos; } @@ -276,7 +275,6 @@ class SystemCheck return $result; } - private static function checkGeolocation(&$result) { $currentProviderId = LocationProvider::getCurrentProviderId(); @@ -317,7 +315,6 @@ class SystemCheck Db::exec("DELETE FROM `$optionTable` WHERE option_name IN ('" . implode("','", $testOptionNames) . "')"); } - protected static function initServerFilesForSecurity() { ServerFilesGenerator::createWebConfigFiles(); diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php index 3ee24043f6..82d24beb71 100644 --- a/plugins/Installation/View.php +++ b/plugins/Installation/View.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\Installation; - /** * */ diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index b8a3248a97..fb2d26a3aa 100755 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -326,7 +326,6 @@ </tr> {% endif %} - </table> {% include "@Installation/_integrityDetails.twig" %} diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig index 1a9fb66dcc..81b2e03276 100644 --- a/plugins/Installation/templates/finished.twig +++ b/plugins/Installation/templates/finished.twig @@ -5,7 +5,6 @@ {{ 'Installation_CongratulationsHelp'|translate|raw }} - <br/> <h2>{{ 'Installation_WelcomeToCommunity'|translate }}</h2> <p> diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index b4c1c3eb06..a82b9fac42 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -714,7 +714,6 @@ class Visitor implements VisitorInterface $visitorDetailsArray['exitPageUrl'] = $lastAction['url']; } - return $visitorDetailsArray; } @@ -787,7 +786,6 @@ class Visitor implements VisitorInterface $actionDetail['customVariables'] = $customVariablesPage; } - if($actionDetail['type'] == Action::TYPE_EVENT_CATEGORY) { // Handle Event if(strlen($actionDetail['pageTitle']) > 0) { diff --git a/plugins/Live/javascripts/live.js b/plugins/Live/javascripts/live.js index 00da9904d0..dfda0f468a 100644 --- a/plugins/Live/javascripts/live.js +++ b/plugins/Live/javascripts/live.js @@ -200,7 +200,6 @@ }); })(jQuery); - $(function() { var refreshWidget = function (element, refreshAfterXSecs) { // if the widget has been removed from the DOM, abort @@ -271,7 +270,6 @@ $(function() { }; }); - var pauseImage = "plugins/Live/images/pause.gif"; var pauseDisabledImage = "plugins/Live/images/pause_disabled.gif"; var playImage = "plugins/Live/images/play.gif"; diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index e8072366d9..e238e75d16 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -108,7 +108,6 @@ </div> {% endset %} - {% set visitorRow %} <tr class="label{{ cycle(['odd','even'], cycleIndex) }}"> {% set cycleIndex=cycleIndex+1 %} diff --git a/plugins/Login/stylesheets/login.css b/plugins/Login/stylesheets/login.css index e504be1b6a..9b0e797c8d 100644 --- a/plugins/Login/stylesheets/login.css +++ b/plugins/Login/stylesheets/login.css @@ -48,7 +48,6 @@ text-transform: none; } - /* LAYOUT ***********************/ #loginPage a { @@ -82,7 +81,6 @@ position: relative; } - /* FORM ***********************/ .loginSection form { @@ -113,7 +111,6 @@ vertical-align: middle; } - /* FIELDS ***********************/ .loginSection form input[type="text"], @@ -149,7 +146,6 @@ background-position: 10px 11px; } - /* MESSAGE ***********************/ #loginPage .message_error, @@ -169,7 +165,6 @@ border-color: #e6db55; } - /* NAVIGATION ***********************/ #nav, diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 29b36a8f3f..8e89039dd0 100644 --- a/plugins/Morpheus/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js @@ -5,7 +5,6 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ - function _pk_translate(translationStringId, values) { function sprintf (translation, values) { @@ -383,7 +382,6 @@ var piwikHelper = { }; - String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g,""); }; diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less index cf31fb6925..2372f4d92b 100644 --- a/plugins/Morpheus/stylesheets/general/_forms.less +++ b/plugins/Morpheus/stylesheets/general/_forms.less @@ -78,7 +78,6 @@ button[type="button"], font-weight: normal; } - .sites_autocomplete--dropdown { .custom_select_main_link:not(.loading):before { color: @theme-color-brand; @@ -92,7 +91,6 @@ button[type="button"], } } - .limitSelection { > ul { position: relative; diff --git a/plugins/Morpheus/stylesheets/general/_typography.less b/plugins/Morpheus/stylesheets/general/_typography.less index bb22742844..c202176556 100644 --- a/plugins/Morpheus/stylesheets/general/_typography.less +++ b/plugins/Morpheus/stylesheets/general/_typography.less @@ -73,7 +73,6 @@ ul.widgetpreview-widgetlist, ul.widgetpreview-categorylist { color: #4d4d4d; } - .dataTableRowActions { background: none !important; } diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less index 820c8d3953..3c7eef2b2b 100644 --- a/plugins/Morpheus/stylesheets/theme.less +++ b/plugins/Morpheus/stylesheets/theme.less @@ -529,7 +529,6 @@ div.sparkline { z-index: 1; } - .widget { background: @theme-color-background-base; border: 1px solid @color-silver-l80; @@ -676,7 +675,6 @@ div.sparkline { margin-bottom: 12px; } - ol { background: #fff !important; border-top: 0 !important; @@ -706,7 +704,6 @@ div.sparkline { min-width: 100% !important; } - .visitor-profile { background: none; .box-shadow(none); @@ -757,7 +754,6 @@ div.sparkline { } } - .visitor-profile-avatar { ul { width: 100% !important; @@ -855,7 +851,6 @@ div.sparkline { padding: 5px !important; } - #piwik-promo-share { border: 0px; background: #f2f2f2; @@ -886,7 +881,6 @@ table#users { text-decoration: none; } - #multisites table.dataTable { thead tr th { background: @theme-color-background-base; diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less index fe427fc545..76db939f73 100644 --- a/plugins/Morpheus/stylesheets/ui/_components.less +++ b/plugins/Morpheus/stylesheets/ui/_components.less @@ -167,7 +167,6 @@ .font-default(10px, 12px); } - #periodString { border: 1px solid @theme-color-background-lowContrast; .border-radius(0px); @@ -339,7 +338,6 @@ } } - table.dataTable tr td .dataTableRowActions { a.rightmost, a { background-color: #f2f2f2 !important; diff --git a/plugins/Morpheus/stylesheets/uibase/_siteSelect.less b/plugins/Morpheus/stylesheets/uibase/_siteSelect.less index f52528a223..f71303d29a 100644 --- a/plugins/Morpheus/stylesheets/uibase/_siteSelect.less +++ b/plugins/Morpheus/stylesheets/uibase/_siteSelect.less @@ -1,5 +1,4 @@ - /*sites_autocomplete*/ .sites_autocomplete { position: absolute; diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php index 13f3398b72..7e6c5dfb89 100644 --- a/plugins/Overlay/Overlay.php +++ b/plugins/Overlay/Overlay.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\Overlay; - class Overlay extends \Piwik\Plugin { public function getInformation() diff --git a/plugins/Overlay/client/followingpages.js b/plugins/Overlay/client/followingpages.js index 0ec8c6fef6..860fbc2274 100644 --- a/plugins/Overlay/client/followingpages.js +++ b/plugins/Overlay/client/followingpages.js @@ -485,7 +485,6 @@ var Piwik_Overlay_FollowingPages = (function () { } } - return { /** diff --git a/plugins/Overlay/client/linktags.eps b/plugins/Overlay/client/linktags.eps index 40be171a1b..b0f71481ff 100644 --- a/plugins/Overlay/client/linktags.eps +++ b/plugins/Overlay/client/linktags.eps @@ -30,11 +30,6 @@ %%RGBCustomColor: %%EndComments - - - - - %%BeginDefaults %%ViewingOrientation: 1 0 0 1 %%EndDefaults @@ -4893,26 +4888,6 @@ Adobe_CoolType_Core/ps get exec
Adobe_AGM_Image/ps gx </rdf:RDF> </x:xmpmeta> - - - - - - - - - - - - - - - - - - - - <?xpacket end="w"?>
% &&end XMP packet marker&&
[{ai_metadata_stream_123}
<</Type /Metadata /Subtype /XML>>
/PUT AI11_PDFMark5
[/Document
1 dict begin /Metadata {ai_metadata_stream_123} def
currentdict end /BDC AI11_PDFMark5
%ADOEndClientInjection: PageSetup End "AI11EPS" %%EndPageSetup diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js index d71a480aac..0930180ca6 100644 --- a/plugins/Overlay/javascripts/Piwik_Overlay.js +++ b/plugins/Overlay/javascripts/Piwik_Overlay.js @@ -19,7 +19,6 @@ var Piwik_Overlay = (function () { var iframeCurrentActionLabel = ''; var updateComesFromInsideFrame = false; - /** Load the sidebar for a url */ function loadSidebar(currentUrl) { showLoading(); diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 27b37866ae..7984e8302b 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -58,7 +58,6 @@ {'Overlay_OpenFullScreen'|translate|escape:'html'} </a> --> - <div id="Overlay_Main"> <iframe id="Overlay_Iframe" src="" frameborder="0"></iframe> </div> diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index c94edc67be..c5b1da1687 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -21,7 +21,6 @@ use Piwik\Plugins\Goals\Archiver; use Piwik\Site; use Piwik\Tracker\GoalManager; - require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/LogDataPurger.php'; require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/ReportsPurger.php'; diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index c81a3d37b2..588e0537c3 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -270,7 +270,6 @@ {% endif %} - <h2 id="DNT">{{ 'PrivacyManager_DoNotTrack_SupportDNTPreference'|translate }}</h2> <table class="adminTable" style='width:800px;'> <tr> diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php index e5024e4e7d..c5dcaef73d 100644 --- a/plugins/Referrers/Archiver.php +++ b/plugins/Referrers/Archiver.php @@ -71,7 +71,6 @@ class Archiver extends \Piwik\Plugin\Archiver ); } - protected function makeReferrerTypeNonEmpty(&$row) { if (empty($row['referer_type'])) { diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php index db480b05a6..31f2300211 100644 --- a/plugins/Referrers/Columns/Base.php +++ b/plugins/Referrers/Columns/Base.php @@ -18,7 +18,6 @@ use Piwik\Tracker\Visitor; use Piwik\Tracker\Action; use Piwik\UrlHelper; - abstract class Base extends VisitDimension { diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index 776deea520..08dc94ee6d 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -293,7 +293,6 @@ class ScheduledReports extends \Piwik\Plugin $mail->setBodyHtml($message . "<br/><br/>" . $contents); break; - case 'csv': $message .= "\n" . Piwik::translate('ScheduledReports_PleaseFindAttachedFile', array($periods[$report['period']], $reportTitle)); diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js index 19878ea4dd..59b16c9d08 100644 --- a/plugins/ScheduledReports/javascripts/pdf.js +++ b/plugins/ScheduledReports/javascripts/pdf.js @@ -52,7 +52,6 @@ function formSetEditReport(idReport) { } } - $('[name=reportsList] input').prop('checked', false); var key; diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index c364c54323..301fe44a50 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -218,7 +218,6 @@ class API extends \Piwik\Plugin\API */ Piwik::postEvent('SegmentEditor.update', array($idSegment, $bind)); - $db = Db::get(); $db->update(Common::prefixTable("segment"), $bind, diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js index 3e965e4767..1dac89a269 100644 --- a/plugins/SegmentEditor/javascripts/Segmentation.js +++ b/plugins/SegmentEditor/javascripts/Segmentation.js @@ -272,7 +272,6 @@ Segmentation = (function($) { }); }; - var findAndExplodeByMatch = function(metric){ var matches = ["==" , "!=" , "<=", ">=", "=@" , "!@","<",">"]; var newMetric = {}; @@ -1080,7 +1079,6 @@ Segmentation = (function($) { return segmentation; })(jQuery); - $(document).ready(function() { var exports = require('piwik/UI'); var UIControl = exports.UIControl; @@ -1188,7 +1186,6 @@ $(document).ready(function() { ajaxHandler.send(true); }; - var deleteSegment = function(params){ var ajaxHandler = new ajaxHelper(); ajaxHandler.addParams({ diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index d55c40686e..2801ba86b5 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -1175,7 +1175,6 @@ class API extends \Piwik\Plugin\API "idsite = $idSite" ); - // we now update the main + alias URLs $this->deleteSiteAliasUrls($idSite); if (count($urls) > 1) { diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html index 7e8e2d4587..3b73950cbb 100644 --- a/plugins/SitesManager/templates/sites-list/site-fields.html +++ b/plugins/SitesManager/templates/sites-list/site-fields.html @@ -90,7 +90,6 @@ ng-switch="site.editMode"> </td> - <td ng-switch="site.editMode" sites-manager-edit-trigger> <span ng-switch-default> diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index 174bce2474..3785e7492e 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -5,7 +5,6 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ - // // TRANSITIONS ROW ACTION FOR DATA TABLES // @@ -115,7 +114,6 @@ DataTable_RowActions_Registry.register({ }); - // // TRANSITIONS IMPLEMENTATION // @@ -717,7 +715,6 @@ Piwik_Transitions.prototype.openExternalUrl = function (url) { window.open(url, '_newtab'); }; - // -------------------------------------- // CANVAS // -------------------------------------- @@ -1221,7 +1218,6 @@ Piwik_Transitions_Canvas.prototype.clearSide = function (side, onlyBg) { } }; - // -------------------------------------- // MODEL // -------------------------------------- @@ -1408,7 +1404,6 @@ Piwik_Transitions_Model.prototype.roundPercentage = function (value) { } }; - // -------------------------------------- // AJAX // -------------------------------------- @@ -1493,7 +1488,6 @@ Piwik_Transitions_Ajax.prototype.callApi = function (method, params, callback) { ajaxRequest.send(false); }; - // -------------------------------------- // STATIC UTIL FUNCTIONS // -------------------------------------- diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index eaf8083a8a..1bbf781d4f 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp; - use Piwik\Log; use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js index fe5aacb1ec..48b9e33c3b 100644 --- a/plugins/UserCountryMap/javascripts/visitor-map.js +++ b/plugins/UserCountryMap/javascripts/visitor-map.js @@ -247,7 +247,6 @@ return colscale; } - function formatPercentage(val) { if (val < 0.001) return '< 0.1%'; return Math.round(1000 * val) / 10 + '%'; @@ -334,7 +333,6 @@ $('.UserCountryMap-tooltip').hide(); } - /* * updateState, called whenever the view changes */ @@ -561,7 +559,6 @@ }); } - /* * updateMap is called by renderCountryMap() and renderWorldMap() */ @@ -942,7 +939,6 @@ }); } - _updateMap(iso + '.svg', function () { // add background @@ -1200,7 +1196,6 @@ }, - /* * resizes the map */ @@ -1231,7 +1226,6 @@ }()); - /* * Some static data used both by VisitorMap and RealtimeMap */ diff --git a/plugins/UserCountryMap/stylesheets/map.css b/plugins/UserCountryMap/stylesheets/map.css index 400e28384d..679a69a483 100644 --- a/plugins/UserCountryMap/stylesheets/map.css +++ b/plugins/UserCountryMap/stylesheets/map.css @@ -81,4 +81,3 @@ fill: #808888; } - diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index 40e48c5840..ad5deec648 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -50,7 +50,6 @@ function getOSShortLabel($osId) return $osId; } - function getOSFamily($osLabel) { $osId = UserAgentParser::getOperatingSystemIdFromName($osLabel); @@ -101,7 +100,6 @@ function getBrowserTypeLabel($oldLabel) return $oldLabel; } - function getConfigurationLabel($str) { if (strpos($str, ';') === false) { diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 1804ebea54..8726ae9d67 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -143,7 +143,6 @@ class Controller extends \Piwik\Plugin\Controller $dataTableVisit = self::getVisitsSummary(); $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow(); - $view->nbUniqVisitors = (int)$dataRow->getColumn('nb_uniq_visitors'); $nbVisits = (int)$dataRow->getColumn('nb_visits'); $view->nbVisits = $nbVisits; @@ -169,7 +168,6 @@ class Controller extends \Piwik\Plugin\Controller $view->nbUniqueOutlinks = (int)$dataActionsRow->getColumn('nb_uniq_outlinks'); $view->averageGenerationTime = $dataActionsRow->getColumn('avg_time_generation'); - if ($displaySiteSearch) { $view->nbSearches = (int)$dataActionsRow->getColumn('nb_searches'); $view->nbKeywords = (int)$dataActionsRow->getColumn('nb_keywords'); diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index 066a8e2e35..cc6782f216 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -34,4 +34,3 @@ class VisitsSummary extends \Piwik\Plugin } - diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig index bbf6896214..4ef49917bd 100644 --- a/plugins/Widgetize/templates/index.twig +++ b/plugins/Widgetize/templates/index.twig @@ -2,7 +2,6 @@ {% block content %} - <div class="pageWrap"> <div class="top_controls"> {% include "@CoreHome/_siteSelectHeader.twig" %} @@ -31,7 +30,6 @@ }); </script> - <div class="widgetize"> <p>With Piwik, you can export your Web Analytics reports on your blog, website, or intranet dashboard... in one click. diff --git a/plugins/Widgetize/templates/testJsInclude1.twig b/plugins/Widgetize/templates/testJsInclude1.twig index f064807d3c..d6dc48e968 100644 --- a/plugins/Widgetize/templates/testJsInclude1.twig +++ b/plugins/Widgetize/templates/testJsInclude1.twig @@ -2,7 +2,6 @@ <body> <p>This text is after the JS INCLUDE</p> - <h2>Test tag cloud in a JS include</h2> <div style="width:500px;"> diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php index ca77a609f7..e3cb5ab3fd 100644 --- a/tests/PHPUnit/Core/AssetManagerTest.php +++ b/tests/PHPUnit/Core/AssetManagerTest.php @@ -577,7 +577,6 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase $this->validateMergedStylesheet(); } - /** * @group Core */ diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php index 757c010472..469015a24c 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php @@ -74,7 +74,6 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa $this->assertEquals(array(90, 100), $table->getColumn('count')); } - /** * Test to exclude low population filter * diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php index 82eab7b484..4c5c77a355 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php @@ -90,7 +90,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ @@ -196,7 +195,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase $table1 = new DataTable(); $table1->addRowsFromArray($array1); - $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), @@ -210,7 +208,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase $table3 = new DataTable(); - $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php index 6a2a77670c..7da7dedb53 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php @@ -64,7 +64,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase $this->assertEquals($expected, $rendered); } - /** * test with a row without child * diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php index d9ed90837b..c18ee12e60 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php @@ -90,7 +90,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ @@ -185,7 +184,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase $table1 = new DataTable(); $table1->addRowsFromArray($array1); - $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), @@ -199,7 +197,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase $table3 = new DataTable(); - $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); @@ -274,7 +271,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php index 36adfbfacd..7ba4088e5c 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php @@ -90,7 +90,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ @@ -222,7 +221,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase $this->assertEquals($expected, $render->render()); } - /** * DATA OF DATATABLE_ARRAY * ------------------------- @@ -241,7 +239,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase $table1 = new DataTable(); $table1->addRowsFromArray($array1); - $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), @@ -255,7 +252,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase $table3 = new DataTable(); - $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); @@ -330,7 +326,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php index 2e42d7b268..40596e0e23 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php @@ -90,7 +90,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase return $table; } - /** * @group Core */ @@ -222,7 +221,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase $this->assertEquals($expected, $render->render()); } - /** * DATA OF DATATABLE_ARRAY * ------------------------- @@ -241,7 +239,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase $table1 = new DataTable(); $table1->addRowsFromArray($array1); - $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), @@ -255,7 +252,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase $table3 = new DataTable(); - $table = new DataTable\Map(); $table->setKeyName('testKey'); $table->addTable($table1, 'date1'); diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index 656df66a90..afb3e168fe 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -203,7 +203,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase ); $table->addRowsFromArray($rows); - $this->assertEquals(count($rows), $table->getRowsCount()); $countAllRows = count($rows) + count($rows1) + count($rows2) + count($rows1sub); $this->assertEquals($countAllRows, $table->getRowsCountRecursive()); @@ -280,7 +279,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase $rowWanted = new Row(array(Row::COLUMNS => $columnsWanted, Row::METADATA => $metadata)); $this->assertTrue(Row::isEqual($rowWanted, $finalRow)); - // testing that, 'sumRow' does not result in extra unwanted attributes being serialized $expectedRow = 'O:19:"Piwik\DataTable\Row":1:{s:1:"c";a:3:{i:0;a:8:{s:8:"test_int";i:150;s:10:"test_float";d:150;s:11:"test_float2";d:14.5;s:14:"test_stringint";i:150;i:0;s:4:"toto";s:17:"integerArrayToSum";a:3:{i:1;i:6;i:2;d:15.5;i:3;a:2:{i:2;i:7;i:1;i:2;}}s:11:"test_float3";d:1.5;s:4:"test";s:11:"string fake";}i:1;a:2:{s:4:"logo";s:9:"piwik.png";s:5:"super";a:1:{i:0;s:39:"this column has an array value, amazing";}}i:3;N;}}'; $this->assertEquals($expectedRow, serialize($finalRow)); @@ -348,7 +346,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase $table->getSerialized(); } - /** * Test queing filters * @@ -459,7 +456,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * SUB TABLE */ - $row = array(Row::COLUMNS => array(0 => 1554,), Row::METADATA => array('searchengine' => 'google'), ); @@ -474,7 +470,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase ); $subtable->addRowFromArray($row); - /* * SUB SUB TABLE */ @@ -541,7 +536,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * - when a subtable */ - /** * add an empty datatable to a normal datatable * @@ -728,7 +722,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase $this->assertTrue(DataTable::isEqual($table, $tableExpected)); } - /** * @group Core */ @@ -787,7 +780,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase $table2->getFirstRow()->addSubtable($table1); $idSubtable = $table1->getId(); - /* Check it looks good: $renderer = DataTable\Renderer::factory('xml'); $renderer->setTable($table2); diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php index fbff27519e..2193d10674 100644 --- a/tests/PHPUnit/Core/DateTest.php +++ b/tests/PHPUnit/Core/DateTest.php @@ -145,7 +145,6 @@ class DateTest extends PHPUnit_Framework_TestCase $date = $date->addHour(0)->addHour(0)->addHour(0); $this->assertEquals($timestamp, $date->getTimestamp()); - if (SettingsServer::isTimezoneSupportEnabled()) { $date = Date::factory('2010-01-01')->setTimezone('Europe/Paris'); $dateExpected = clone $date; diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php index cbf0c59816..f12d37dfed 100644 --- a/tests/PHPUnit/Core/IPTest.php +++ b/tests/PHPUnit/Core/IPTest.php @@ -600,7 +600,6 @@ class IPTest extends PHPUnit_Framework_TestCase ); } - /** * @group Core * diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Core/MetricsTest.php index ba98fa11de..735905b052 100644 --- a/tests/PHPUnit/Core/MetricsTest.php +++ b/tests/PHPUnit/Core/MetricsTest.php @@ -94,8 +94,7 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase $actual = Metrics::isLowerValueBetter($column);
$this->assertEquals($expected, $actual);
}
-
-
+ public function getUnitColumns()
{
return array(
@@ -124,6 +123,5 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase $actual = Metrics::getUnit($column, 1);
$this->assertEquals($expected, $actual);
}
-
-
+ }
\ No newline at end of file diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php index 6d87dffb10..c99abfd3ef 100644 --- a/tests/PHPUnit/Core/Period/RangeTest.php +++ b/tests/PHPUnit/Core/Period/RangeTest.php @@ -342,7 +342,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase } $correct = array_reverse($correct); - $this->assertEquals(50, $range->getNumberOfSubperiods()); $this->assertEquals($correct, $range->toString()); } @@ -412,7 +411,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase } $correct = array_reverse($correct); - $this->assertEquals(10, $range->getNumberOfSubperiods()); $this->assertEquals($correct, $range->toString()); } @@ -439,7 +437,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase $this->assertEquals($correct, $range->toString()); } - /** * @group Core */ @@ -536,7 +533,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase } $correct = array_reverse($correct); - $this->assertEquals(10, $range->getNumberOfSubperiods()); $this->assertEquals($correct, $range->toString()); } @@ -558,7 +554,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase } $correct = array_reverse($correct); - $this->assertEquals(10, $range->getNumberOfSubperiods()); $this->assertEquals($correct, $range->toString()); } diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php index 97aeace84a..0d8acb94e2 100644 --- a/tests/PHPUnit/Core/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php @@ -18,8 +18,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase parent::setUp(); } - - /** * @group Core */ @@ -68,7 +66,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase $this->checkFilesAreInJpgFormat($files); } - /** * @group Core */ @@ -88,11 +85,9 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase $this->_checkEqual(array('log' => 'log_writers'), array('screen')); $this->_checkEqual(array('log' => 'logger_api_call'), null); - require_once PIWIK_INCLUDE_PATH . "/core/TaskScheduler.php"; $this->assertFalse(DEBUG_FORCE_SCHEDULED_TASKS); - // Check the index.php has "backtrace disabled" $content = file_get_contents(PIWIK_INCLUDE_PATH . "/index.php"); $expected = "define('PIWIK_PRINT_ERROR_BACKTRACE', false);"; @@ -171,7 +166,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase $handle = fopen($file, "r"); $expectedStart = "<?php"; - $isIniFile = strpos($file, ".ini.php") !== false || strpos($file, ".ini.travis.php") !== false; if($isIniFile) { $expectedStart = "; <?php exit;"; @@ -259,7 +253,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase $this->assertTrue($count > $magicPlugins); } - /** * @group Core */ @@ -387,5 +380,4 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase return $addedToGit; } - } diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php index 9d047546c9..1a62019392 100644 --- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php @@ -97,12 +97,10 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase $timeUTC = $mock->getRescheduledTime(); $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $timeUTC); - $mock->setTimezone('Pacific/Auckland'); $timeAuckland = $mock->getRescheduledTime(); $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC); - $mock->setTimezone('America/Los_Angeles'); $timeLosAngeles = $mock->getRescheduledTime(); $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC); diff --git a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php index 1a57fd2df5..17bde4ee6d 100644 --- a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php @@ -109,12 +109,10 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase $timeUTC = $mock->getRescheduledTime(); $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $timeUTC); - $mock->setTimezone('Pacific/Auckland'); $timeAuckland = $mock->getRescheduledTime(); $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC); - $mock->setTimezone('America/Los_Angeles'); $timeLosAngeles = $mock->getRescheduledTime(); $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC); diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php index 2f6df0230a..62b6fce8ed 100644 --- a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php @@ -145,12 +145,10 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase $timeUTC = $mock->getRescheduledTime(); $this->assertEquals(self::$_JANUARY_04_1971_00_00_00, $timeUTC); - $mock->setTimezone('Pacific/Auckland'); $timeAuckland = $mock->getRescheduledTime(); $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC); - $mock->setTimezone('America/Los_Angeles'); $timeLosAngeles = $mock->getRescheduledTime(); $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC); diff --git a/tests/PHPUnit/Core/UrlHelperTest.php b/tests/PHPUnit/Core/UrlHelperTest.php index 99c89fa42d..79ba4fbecd 100644 --- a/tests/PHPUnit/Core/UrlHelperTest.php +++ b/tests/PHPUnit/Core/UrlHelperTest.php @@ -176,16 +176,13 @@ class Core_UrlHelperTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($expected, UrlHelper::getLossyUrl($input));
}
-
-
-
+ private function includeDataFilesForSearchEngineTest()
{
include "DataFiles/SearchEngines.php";
include "DataFiles/Countries.php";
}
-
-
+ /**
* @group Core
*/
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php index f30508186c..fe4261854f 100644 --- a/tests/PHPUnit/Core/UrlTest.php +++ b/tests/PHPUnit/Core/UrlTest.php @@ -280,5 +280,4 @@ class UrlTest extends PHPUnit_Framework_TestCase ); } - } diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php index d9c213f01a..e7387927c4 100644 --- a/tests/PHPUnit/Fixture.php +++ b/tests/PHPUnit/Fixture.php @@ -745,7 +745,6 @@ class Fixture extends PHPUnit_Framework_Assert return Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('goal') . " WHERE idgoal = ? AND idsite = ?", array($idGoal, $idSite)) != 0; } - /** * Connects to MySQL w/o specifying a database. */ diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php index 3d43cb159b..4896e6fe2a 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php @@ -61,7 +61,6 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture $this->testFirstPartyCookies($t); - // Create a new Tracker object, with different attributes $t2 = self::getTracker($idSite, $dateTime, $defaultInit = false); diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php index 60969e7041..08b4962a6f 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php @@ -78,7 +78,6 @@ class SomeVisitsWithNonUnicodePageTitles extends Fixture $visitor->setPageCharset('windows-1251'); self::checkResponse($visitor->doTrackPageView('Site Search')); - // Test URL with non unicode Site Search keyword $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); //TESTS: on jenkins somehow the "<-was here" was cut off so removing this test case and simply append the wrong keyword @@ -87,7 +86,6 @@ class SomeVisitsWithNonUnicodePageTitles extends Fixture $visitor->setPageCharset('utf-8'); self::checkResponse($visitor->doTrackPageView('Site Search')); - $visitor->setPageCharset(''); $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); $visitor->setUrl('http://example.org/exit-page'); diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php index f330218f9a..1c12adc3f3 100644 --- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php +++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php @@ -187,7 +187,6 @@ class ThreeSitesWithManyVisitsWithSiteSearch extends Fixture return array($defaultInit, $visitor); } - protected function recordVisitorSite3() { // Third new visitor on Idsite 3 diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 4caa3e1be7..6e913930fd 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -154,7 +154,6 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture } } - /** * @param $idSite2 * @param $dateTime diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php index eceb90a482..236e5e5156 100644 --- a/tests/PHPUnit/Integration/ArchiveCronTest.php +++ b/tests/PHPUnit/Integration/ArchiveCronTest.php @@ -45,7 +45,6 @@ class ArchiveCronTest extends IntegrationTestCase // // } - // API Call Without segments // TODO uncomment week and year period $results[] = array('VisitsSummary.get', array('idSite' => 'all', @@ -74,7 +73,6 @@ class ArchiveCronTest extends IntegrationTestCase 'testSuffix' => '_preArchivedSegment')); } - return $results; } diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php index f893d258c6..644425c292 100644 --- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php +++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php @@ -66,7 +66,6 @@ class AutoSuggestAPITest extends IntegrationTestCase return $apiForTesting; } - /** * @param $idSite * @param $segment diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php index d67e899c1a..34aa3aeefb 100644 --- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php @@ -120,7 +120,6 @@ class Core_ArchiveProcessingTest extends DatabaseTestCase $this->assertTrue($archiveProcessor->public_isArchiveTemporary()); } - private function compareTimestamps($expected, $processed) { // $messageIfFails = Date::factory($expected)->getDatetime() . " != " . Date::factory($processed)->getDatetime(); @@ -420,7 +419,6 @@ class Core_ArchiveProcessingTest extends DatabaseTestCase $this->fail('Exception expected'); } - protected function _checkTableIsExpected($table, $data) { $fetched = Db::fetchAll('SELECT * FROM ' . $table); diff --git a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php index 847af0e3c8..259df6fc9e 100644 --- a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php +++ b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php @@ -51,5 +51,4 @@ class FixedSiteIdsTest extends PHPUnit_Framework_TestCase $this->assertEquals(4, $this->fixedSiteIds->getNumProcessedWebsites()); } - }
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php index cc7d974301..9d515201ec 100644 --- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php +++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php @@ -440,7 +440,6 @@ class Core_Plugin_SettingsTest extends DatabaseTestCase $this->addSystemSetting('mysystemsetting3', 'mytitle3'); $this->settings->save(); - $verifySettings = $this->createSettingsInstance(); $setting1 = $this->buildSystemSetting('mysystemsetting1', 'mytitle1'); diff --git a/tests/PHPUnit/Integration/Core/SegmentTest.php b/tests/PHPUnit/Integration/Core/SegmentTest.php index 79f1273a23..ce7a0c363f 100644 --- a/tests/PHPUnit/Integration/Core/SegmentTest.php +++ b/tests/PHPUnit/Integration/Core/SegmentTest.php @@ -42,7 +42,6 @@ class SegmentTest extends DatabaseTestCase } } - public function getCommonTestData() { return array( diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php index 1498e67578..c145757bac 100644 --- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php @@ -156,7 +156,6 @@ class Core_Tracker_ActionTest extends DatabaseTestCase $this->assertEquals(PageUrl::reconstructNormalizedUrl($url, PageUrl::$urlPrefixMap['http://']), $expectedUrl); } - /** * Testing with some website specific parameters excluded * @group Core @@ -192,7 +191,6 @@ class Core_Tracker_ActionTest extends DatabaseTestCase $this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite)); } - public function getExtractUrlData() { return array( diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php index 1aef6fc6ea..c748b4ddb7 100644 --- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php @@ -157,7 +157,6 @@ class Core_Tracker_VisitTest extends DatabaseTestCase $idsite = API::getInstance()->addSite("name", "http://piwik.net/"); - // test that user agents that contain excluded user agent strings are excluded foreach ($knownSpammers as $spamUrl => $expectedIsReferrerSpam) { $spamUrl = urlencode($spamUrl); @@ -222,7 +221,6 @@ class Core_Tracker_VisitTest extends DatabaseTestCase 'sogou spider' => true, 'Mozilla/5.0(compatible;Sosospider/2.0;+http://help.soso.com/webspider.htm)' => true, - 'AdsBot-Google (+http://www.google.com/adsbot.html)' => true, 'Google Page Speed Insights' => true, // Web snippets diff --git a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php index 993eab14c3..65cdf9abe8 100644 --- a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php +++ b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php @@ -69,7 +69,6 @@ class Core_Plugin_ViewDataTable_ManagerTest extends DatabaseTestCase $this->assertEmpty(ViewDataTableManager::getViewDataTableParameters('mylogin3', 'API.get5')); } - public function test_clearUserViewDataTableParameters_shouldOnlyRemoveAUsersParameters() { ViewDataTableManager::saveViewDataTableParameters('mylogin1', 'API.get1', array('flat' => 1)); diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php index 08c2e14c0d..b86238004d 100644 --- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php @@ -36,7 +36,6 @@ class Core_WidgetsListTest extends DatabaseTestCase $widgets = WidgetsList::get(); WidgetsList::_reset(); - // check if each category has the right number of widgets $numberOfWidgets = array( 'VisitsSummary_VisitsSummary' => 6, @@ -167,7 +166,6 @@ class Core_WidgetsListTest extends DatabaseTestCase WidgetsList::_reset(); } - /** * @group Core */ diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index e4f5fc154b..6a3c5b796b 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -211,7 +211,6 @@ class EcommerceOrderWithItemsTest extends IntegrationTestCase 'segment' => 'visitConvertedGoalId==666', 'testSuffix' => '_SegmentNoVisit_HaveConvertedNonExistingGoal')), - // test segment visitEcommerceStatus and visitConvertedGoalId array($apiWithSegments_visitConvertedGoal, array( @@ -221,7 +220,6 @@ class EcommerceOrderWithItemsTest extends IntegrationTestCase 'segment' => 'visitEcommerceStatus!=ordered;visitConvertedGoalId==1', 'testSuffix' => '_SegmentVisitHasNotOrderedAndConvertedGoal')), - // test segment pageTitle array('VisitsSummary.get', array('idSite' => $idSite, 'date' => $dateTime, diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php index edf52ffbfd..42278f48ef 100755 --- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php @@ -126,7 +126,6 @@ class ManyVisitorsOneWebsiteTest extends IntegrationTestCase // 'otherRequestParameters' => array('filter_sort_order' => 'asc', 'filter_limit' => 7) // )); - return $apiToTest; } } diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index b7252a11d7..831bab64f3 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -133,7 +133,6 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends IntegrationT */ 'archive_numeric_2010_12' => 17 * 3, - /** * In the January date range, * we archive only Actions plugins. diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php index 7f17bea9c6..1d6bf9f7d2 100644 --- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php @@ -38,7 +38,6 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); } - /** * When the MultiSites plugin is not activated, the SMS content should invite the user to activate it back * @@ -175,7 +174,6 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase ); } - /** * Dataprovider for testContainsUCS2Characters */ diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php index 449a7d748c..4b30d562c8 100644 --- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php @@ -32,7 +32,6 @@ class Plugins_MultiSitesTest extends DatabaseTestCase \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins(); } - /** * Testing that getOne returns a row even when there are no data * This is necessary otherwise ResponseBuilder throws 'Call to a member function getColumns() on a non-object' diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php index 65d520337c..ff5b68989f 100644 --- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php @@ -483,7 +483,6 @@ class Plugins_SitesManagerTest extends DatabaseTestCase $this->assertEquals("http://piwik.net", $siteInfo['main_url']); } - /** * there is no admin site available -> array() * @@ -637,7 +636,6 @@ class Plugins_SitesManagerTest extends DatabaseTestCase sort($siteWanted); $urls = API::getInstance()->getSiteUrlsFromId($idsite); - $this->assertEquals($siteWanted, $urls); } @@ -706,7 +704,6 @@ class Plugins_SitesManagerTest extends DatabaseTestCase $aliasUrls = array_slice($allUrls, 1); $this->assertEquals(array(), $aliasUrls); - } /** @@ -793,7 +790,6 @@ class Plugins_SitesManagerTest extends DatabaseTestCase $this->assertEquals($expectedGroups, API::getInstance()->getSitesGroups()); } - public function getInvalidTimezoneData() { return array( diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php index 5b4e162c4e..41b4fe2ae2 100644 --- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php @@ -590,7 +590,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase $this->assertEquals($wanted1, $access1); $this->assertEquals($wanted2, $access2); - $access1 = $this->api->getUsersAccessFromSite($id1); $access2 = $this->api->getUsersAccessFromSite($id2); $access3 = $this->api->getUsersAccessFromSite($id3); diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php index f0d044c709..b78a93d32a 100644 --- a/tests/PHPUnit/Integration/PrivacyManagerTest.php +++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php @@ -752,7 +752,6 @@ class PrivacyManagerTest extends IntegrationTestCase $janMetricCount = $this->_getExpectedNumericArchiveCountJan(); $this->assertEquals($janMetricCount, $this->_getTableCount($archiveTables['numeric'][0])); // January - // no range metric for february $febMetricCount = $this->_getExpectedNumericArchiveCountFeb(); $this->assertEquals($febMetricCount, $this->_getTableCount($archiveTables['numeric'][1])); // February diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php index 747b733a9c..d9dce3ad9c 100755 --- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php +++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php @@ -60,7 +60,6 @@ class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends Integrati 'disableArchiving' => true, 'testSuffix' => '_disabledAfter')), - // Testing this particular bug: https://github.com/piwik/piwik/issues/4532 // ENABLE ARCHIVING and Process this custom date range. array('VisitsSummary.get', array('idSite' => 'all', @@ -78,7 +77,6 @@ class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends Integrati 'hackDeleteRangeArchivesBefore' => true, 'testSuffix' => '_disabledBefore_isDateRange')), - ); } diff --git a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php index aed03b9343..5ee8fa1699 100644 --- a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php +++ b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php @@ -99,7 +99,6 @@ class VisitsInPastInvalidateOldReportsTest extends IntegrationTestCase } catch(Exception $e) { } - // 2) Call API again, with an older date, which should now return data $this->runApiTests($api, $params); } diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 2678196801..107c575a32 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -183,7 +183,6 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase ) ); - // CSV Scheduled Report array_push( $apiCalls, diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php index 3818457093..c03c9ad61d 100644 --- a/tests/PHPUnit/Plugins/ReferrersTest.php +++ b/tests/PHPUnit/Plugins/ReferrersTest.php @@ -196,7 +196,6 @@ class ReferrersTest extends PHPUnit_Framework_TestCase $this->assertContains($expected, \Piwik\Plugins\Referrers\getSocialsLogoFromUrl($url)); } - public function isSocialUrlTestData() { return array( diff --git a/tests/PHPUnit/travis-helper.sh b/tests/PHPUnit/travis-helper.sh index f8bc0fec89..23e3943481 100644 --- a/tests/PHPUnit/travis-helper.sh +++ b/tests/PHPUnit/travis-helper.sh @@ -40,7 +40,6 @@ local timeout=40 shift local count=0 - # clear the line echo -e "\n" diff --git a/tests/README.md b/tests/README.md index cabef0a92a..313e2f2970 100644 --- a/tests/README.md +++ b/tests/README.md @@ -82,8 +82,6 @@ To execute the tests: 5. Write more tests :) See ["Writing Unit tests with PHPUnit"](http://www.phpunit.de/manual/current/en/writing-tests-for-phpunit.html) - - ## Integration Tests Integration tests files are in `tests/PHPUnit/Integration/*Test.php` diff --git a/tests/angularjs/bootstrap.js b/tests/angularjs/bootstrap.js index 70e318d150..459f9f10bf 100644 --- a/tests/angularjs/bootstrap.js +++ b/tests/angularjs/bootstrap.js @@ -24,6 +24,5 @@ piwik.config = {"action_url_category_delimiter":"\/","autocomplete_min_sites":"5 var translations = {"CorePluginsAdmin_NoZipFileSelected":"Please select a ZIP file.","General_InvalidDateRange":"Invalid Date Range, Please Try Again","General_Loading":"Loading...","General_Show":"show","General_Hide":"hide","General_YearShort":"yr","General_MultiSitesSummary":"All Websites","CoreHome_YouAreUsingTheLatestVersion":"You are using the latest version of Piwik!","CoreHome_IncludeRowsWithLowPopulation":"Rows with low population are hidden %s Show all rows","CoreHome_ExcludeRowsWithLowPopulation":"All rows are shown %s Exclude low population","CoreHome_DataTableIncludeAggregateRows":"Aggregate rows are hidden %s Show them","CoreHome_DataTableExcludeAggregateRows":"Aggregate rows are shown %s Hide them","CoreHome_Default":"default","CoreHome_PageOf":"%1$s of %2$s","CoreHome_FlattenDataTable":"The report is hierarchical %s Make it flat","CoreHome_UnFlattenDataTable":"The report is flat %s Make it hierarchical","CoreHome_ExternalHelp":"Help (opens in new tab)","SitesManager_NotFound":"No websites found for","Annotations_ViewAndAddAnnotations":"View and add annotations for %s...","General_RowEvolutionRowActionTooltipTitle":"Open Row Evolution","General_RowEvolutionRowActionTooltip":"See how the metrics for this row changed over time","Annotations_IconDesc":"View notes for this date range.","Annotations_IconDescHideNotes":"Hide notes for this date range.","Annotations_HideAnnotationsFor":"Hide annotations for %s...","General_LoadingPopover":"Loading %s...","General_LoadingPopoverFor":"Loading %s for","General_ShortMonth_1":"Jan","General_ShortMonth_2":"Feb","General_ShortMonth_3":"Mar","General_ShortMonth_4":"Apr","General_ShortMonth_5":"May","General_ShortMonth_6":"Jun","General_ShortMonth_7":"Jul","General_ShortMonth_8":"Aug","General_ShortMonth_9":"Sep","General_ShortMonth_10":"Oct","General_ShortMonth_11":"Nov","General_ShortMonth_12":"Dec","General_LongMonth_1":"January","General_LongMonth_2":"February","General_LongMonth_3":"March","General_LongMonth_4":"April","General_LongMonth_5":"May","General_LongMonth_6":"June","General_LongMonth_7":"July","General_LongMonth_8":"August","General_LongMonth_9":"September","General_LongMonth_10":"October","General_LongMonth_11":"November","General_LongMonth_12":"December","General_ShortDay_1":"Mon","General_ShortDay_2":"Tue","General_ShortDay_3":"Wed","General_ShortDay_4":"Thu","General_ShortDay_5":"Fri","General_ShortDay_6":"Sat","General_ShortDay_7":"Sun","General_LongDay_1":"Monday","General_LongDay_2":"Tuesday","General_LongDay_3":"Wednesday","General_LongDay_4":"Thursday","General_LongDay_5":"Friday","General_LongDay_6":"Saturday","General_LongDay_7":"Sunday","General_DayMo":"Mo","General_DayTu":"Tu","General_DayWe":"We","General_DayTh":"Th","General_DayFr":"Fr","General_DaySa":"Sa","General_DaySu":"Su","General_Search":"Search","General_MoreDetails":"More Details","General_Help":"Help","General_MetricsToPlot":"Metrics to plot","General_MetricToPlot":"Metric to plot","General_RecordsToPlot":"Records to plot","General_SaveImageOnYourComputer":"To save the image on your computer, right click on the image and select \"Save Image As...\"","General_ExportAsImage":"Export as Image","General_NoDataForGraph":"No data for this graph.","Widgetize_OpenInNewWindow":"Open in a new window","Dashboard_LoadingWidget":"Loading widget, please wait...","General_TransitionsRowActionTooltipTitle":"Open Transitions","General_TransitionsRowActionTooltip":"See what visitors did before and after viewing this page","Dashboard_AddPreviewedWidget":"Click to add widget to the dashboard","Dashboard_WidgetPreview":"Widget preview","Dashboard_Maximise":"Maximise","Dashboard_Minimise":"Minimise","Dashboard_WidgetNotFound":"Widget not found","Dashboard_DashboardCopied":"Current dashboard successfully copied to selected user.","General_Close":"Close","General_Refresh":"Refresh","General_Website":"Website","General_ColumnNbVisits":"Visits","General_ColumnPageviews":"Pageviews","General_ColumnRevenue":"Revenue","General_TotalVisitsPageviewsRevenue":"(Total: %s visits, %s pageviews, %s revenue)","General_EvolutionSummaryGeneric":"%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s","General_AllWebsitesDashboard":"All Websites dashboard","General_NVisits":"%s visits","MultiSites_Evolution":"Evolution","SitesManager_AddSite":"Add a new website","General_Next":"Next","General_Previous":"Previous","General_GoTo":"Go to %s","Dashboard_DashboardOf":"Dashboard of %s","Actions_SubmenuSitesearch":"Site Search","MultiSites_LoadingWebsites":"Loading websites","General_ErrorRequest":"Oops\u2026 problem during the request, please try again.","Goals_AddGoal":"Add Goal","Goals_UpdateGoal":"Update Goal","Goals_DeleteGoalConfirm":"Are you sure you want to delete the Goal %s?","UserCountry_FatalErrorDuringDownload":"A fatal error occurred while downloading this file. There might be something wrong with your internet connection, with the GeoIP database you downloaded or Piwik. Try downloading and installing it manually.","UserCountry_SetupAutomaticUpdatesOfGeoIP":"Setup automatic updates of GeoIP databases","General_Done":"Done","Feedback_ThankYou":"Thank you for helping us to make Piwik better!","Feedback_RateFeatureTitle":"Do you like the '%s' feature? Please rate and leave a comment","Feedback_RateFeatureThankYouTitle":"Thank you for rating '%s'!","Feedback_RateFeatureLeaveMessageLike":"We are glad you like it! Please let us know what you like the most or if you have a feature request.","Feedback_RateFeatureLeaveMessageDislike":"We are sorry to hear you don't like it! Please let us know how we can improve.","Feedback_SendFeedback":"Send Feedback","Feedback_RateFeatureSendFeedbackInformation":"Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.","General_Ok":"Ok","General_OrCancel":"or %s Cancel %s","General_Save":"Save","UsersManager_DeleteConfirm":"Are you sure you want to delete the user %s?","UsersManager_ConfirmGrantSuperUserAccess":"Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.","UsersManager_ConfirmProhibitOtherUsersSuperUserAccess":"Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.","UsersManager_ConfirmProhibitMySuperUserAccess":"%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.","SitesManager_OnlyOneSiteAtTime":"You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.","SitesManager_DeleteConfirm":"Are you sure you want to delete the website %s?","ScheduledReports_ReportSent":"Report sent","ScheduledReports_ReportUpdated":"Report updated","General_OverlayRowActionTooltipTitle":"Open Page Overlay","General_OverlayRowActionTooltip":"See analytics data directly on your website (opens new tab)","CustomAlerts_InvalidMetricValue":"Value must be numeric","Live_VisitorProfile":"Visitor profile","Live_NoMoreVisits":"There are no more visits for this visitor.","Live_ShowMap":"show map","Live_HideMap":"hide map","Live_PageRefreshed":"Number of times this page was viewed \/ refreshed in a row."}; if(typeof(piwik_translations) == 'undefined') { var piwik_translations = new Object; }for(var i in translations) { piwik_translations[i] = translations[i];} - var expect = chai.expect , should = chai.should();
\ No newline at end of file diff --git a/tests/angularjs/karma.conf.js b/tests/angularjs/karma.conf.js index 959fd98842..641da9895b 100755 --- a/tests/angularjs/karma.conf.js +++ b/tests/angularjs/karma.conf.js @@ -7,12 +7,10 @@ module.exports = function(config) { // base path that will be used to resolve all patterns (eg. files, exclude) basePath: '../../', - // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter frameworks: ['mocha'], - // list of files / patterns to load in the browser files: [ 'tests/angularjs/node_modules/chai/chai.js', @@ -35,12 +33,10 @@ module.exports = function(config) { 'plugins/*/angularjs/**/*_spec.js' ], - // list of files to exclude exclude: [ ], - // preprocess matching files before serving them to the browser // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { @@ -60,21 +56,17 @@ module.exports = function(config) { // enable / disable colors in the output (reporters and logs) colors: true, - // level of logging // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG logLevel: config.LOG_INFO, - // enable / disable watching file and executing tests whenever any file changes autoWatch: true, - // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher browsers: ['PhantomJS'], - // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits singleRun: false diff --git a/tests/javascript/assets/qunit.css b/tests/javascript/assets/qunit.css index 7ba3f9a30b..6229ea8323 100644 --- a/tests/javascript/assets/qunit.css +++ b/tests/javascript/assets/qunit.css @@ -17,7 +17,6 @@ #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } #qunit-tests { font-size: smaller; } - /** Resets */ #qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { @@ -25,7 +24,6 @@ padding: 0; } - /** Header */ #qunit-header { @@ -218,7 +216,6 @@ #qunit-banner.qunit-fail { background-color: #EE5757; } - /** Result */ #qunit-testresult { diff --git a/tests/javascript/assets/qunit.js b/tests/javascript/assets/qunit.js index 583167699b..bd7fa61f9b 100644 --- a/tests/javascript/assets/qunit.js +++ b/tests/javascript/assets/qunit.js @@ -155,7 +155,6 @@ Test.prototype = { /*jshint camelcase:false */ - /** * Expose the current test environment. * @@ -1106,7 +1105,6 @@ QUnit.load = function() { ( config.module === undefined ? "selected='selected'" : "" ) + ">< All Modules ></option>"; - for ( i = 0; i < numModules; i++) { moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(moduleNames[i]) ) + "' " + ( config.module === moduleNames[i] ? "selected='selected'" : "" ) + diff --git a/tests/javascript/frameworks/dojo/dojo-1.0.3.js b/tests/javascript/frameworks/dojo/dojo-1.0.3.js index 793be17a79..27762f7e9c 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.0.3.js +++ b/tests/javascript/frameworks/dojo/dojo-1.0.3.js @@ -204,7 +204,6 @@ if(typeof dojo == "undefined"){ return !!d.getObject(name, false, obj); // Boolean } - dojo["eval"] = function(/*String*/ scriptFragment){ // summary: // Perform an evaluation in the global scope. Use this rather than @@ -317,7 +316,6 @@ if(typeof dojo == "undefined"){ _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -646,7 +644,6 @@ if(typeof dojo == "undefined"){ } } - dojo.requireIf = function(/*Boolean*/ condition, /*String*/ resourceName){ // summary: // If the condition is true then call dojo.require() for the specified @@ -740,7 +737,6 @@ if(typeof dojo == "undefined"){ d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"); var ire = new RegExp("^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$"); @@ -886,7 +882,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1350,7 +1345,6 @@ dojo.delegate = function(obj, props){ } =====*/ - dojo.delegate = dojo._delegate = function(obj, props){ // boodman/crockford delegation @@ -1445,7 +1439,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - // this file courtesy of the TurboAjax group, licensed under a Dojo CLA dojo.declare = function(/*String*/ className, /*Function|Function[]*/ superclass, /*Object*/ props){ @@ -1632,7 +1625,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -1918,7 +1910,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - dojo.Deferred = function(/*Function?*/ canceller){ // summary: // Encapsulates a sequence of callbacks in response to a value that @@ -2198,7 +2189,6 @@ dojo.extend(dojo.Deferred, { } }, - _resback: function(res){ // summary: // The private primitive that means either callback or errback @@ -2650,8 +2640,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - dojo.Color = function(/*Array|String|Object*/ color){ // summary: // takes a named string, hex string, array of rgb or rgba values, @@ -2679,7 +2667,6 @@ dojo.Color.named = { aqua: [0,255,255] }; - dojo.extend(dojo.Color, { r: 255, g: 255, b: 255, a: 1, _set: function(r, g, b, a){ @@ -2807,20 +2794,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - - - - - - - (function(){ if(djConfig.require){ for(var x=0; x<djConfig.require.length; x++){ @@ -2981,7 +2954,6 @@ if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -4496,8 +4468,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - (function(){ var d = dojo; @@ -4964,7 +4934,6 @@ if(!dojo._hasResource["dojo._base.query"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.query"] = true; dojo.provide("dojo._base.query"); - /* dojo.query() architectural overview: @@ -5161,7 +5130,6 @@ dojo.provide("dojo._base.query"); return qparts; }; - //////////////////////////////////////////////////////////////////////// // XPath query code //////////////////////////////////////////////////////////////////////// @@ -6050,10 +6018,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - (function(){ var _d = dojo; function setValue(/*Object*/obj, /*String*/name, /*String*/value){ @@ -6147,7 +6111,6 @@ dojo.provide("dojo._base.xhr"); // // | "blah=blah&multi=thud&multi=thonk" - // FIXME: need to implement encodeAscii!! var ec = encodeURIComponent; var ret = ""; @@ -6382,8 +6345,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - - dojo._ioSetArgs = function(/*dojo.__ioArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -6746,11 +6707,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - - /* Animation losely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js diff --git a/tests/javascript/frameworks/dojo/dojo-1.1.2.js b/tests/javascript/frameworks/dojo/dojo-1.1.2.js index a0749918f6..1b69918082 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.1.2.js +++ b/tests/javascript/frameworks/dojo/dojo-1.1.2.js @@ -424,7 +424,6 @@ dojo.global = { return !!d.getObject(name, false, obj); // Boolean } - dojo["eval"] = function(/*String*/ scriptFragment){ // summary: // Perform an evaluation in the global scope. Use this rather than @@ -436,7 +435,6 @@ dojo.global = { // return: // The result of the evaluation. Often `undefined` - // note: // - JSC eval() takes an optional second argument which can be 'unsafe'. // - Mozilla/SpiderMonkey eval() takes an optional second argument which is the @@ -543,7 +541,6 @@ dojo.global = { _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -1017,7 +1014,6 @@ dojo.global = { d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"); var ire = new RegExp("^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$"); @@ -1243,7 +1239,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1727,7 +1722,6 @@ dojo.delegate = function(obj, props){ } =====*/ - dojo.delegate = dojo._delegate = function(obj, props){ // boodman/crockford delegation @@ -1823,7 +1817,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - // this file courtesy of the TurboAjax group, licensed under a Dojo CLA dojo.declare = function(/*String*/ className, /*Function|Function[]*/ superclass, /*Object*/ props){ @@ -2002,7 +1995,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -2288,7 +2280,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - dojo.Deferred = function(/*Function?*/ canceller){ // summary: // Encapsulates a sequence of callbacks in response to a value that @@ -2568,7 +2559,6 @@ dojo.extend(dojo.Deferred, { } }, - _resback: function(res){ // summary: // The private primitive that means either callback or errback @@ -3018,8 +3008,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - dojo.Color = function(/*Array|String|Object*/ color){ // summary: // takes a named string, hex string, array of rgb or rgba values, @@ -3047,7 +3035,6 @@ dojo.Color.named = { aqua: [0,255,255] }; - dojo.extend(dojo.Color, { r: 255, g: 255, b: 255, a: 1, _set: function(r, g, b, a){ @@ -3175,14 +3162,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - } if(!dojo._hasResource["dojo._base.window"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. @@ -3335,7 +3314,6 @@ if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -5093,8 +5071,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - (function(){ var d = dojo; @@ -5626,7 +5602,6 @@ if(!dojo._hasResource["dojo._base.query"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.query"] = true; dojo.provide("dojo._base.query"); - /* dojo.query() architectural overview: @@ -5824,7 +5799,6 @@ dojo.provide("dojo._base.query"); return qparts; }; - //////////////////////////////////////////////////////////////////////// // XPath query code //////////////////////////////////////////////////////////////////////// @@ -6763,7 +6737,6 @@ dojo.provide("dojo._base.query"); // | }); // | }); - // NOTE: elementsById is not currently supported // NOTE: ignores xpath-ish queries for now @@ -6805,10 +6778,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - (function(){ var _d = dojo; function setValue(/*Object*/obj, /*String*/name, /*String*/value){ @@ -7153,8 +7122,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - - dojo._ioSetArgs = function(/*dojo.__IoArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -7536,11 +7503,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - - /* Animation losely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js @@ -8121,14 +8083,6 @@ if(!dojo._hasResource["dojo._base.browser"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.browser"] = true; dojo.provide("dojo._base.browser"); - - - - - - - - //Need this to be the last code segment in base, so do not place any //dojo.requireIf calls in this file. Otherwise, due to how the build system //puts all requireIf dependencies after the current file, the require calls @@ -8139,7 +8093,6 @@ if(dojo.config.require){ } - if(dojo.config.afterOnLoad && dojo.isBrowser){ //Dojo is being added to the page after page load, so just trigger //the init sequence after a timeout. Using a timeout so the rest of this diff --git a/tests/javascript/frameworks/dojo/dojo-1.3.3.js b/tests/javascript/frameworks/dojo/dojo-1.3.3.js index 3919209708..a7b343fbed 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.3.3.js +++ b/tests/javascript/frameworks/dojo/dojo-1.3.3.js @@ -446,7 +446,6 @@ dojo.global = { return !!d.getObject(name, false, obj); // Boolean } - dojo["eval"] = function(/*String*/ scriptFragment){ // summary: // Perform an evaluation in the global scope. Use this rather than @@ -458,7 +457,6 @@ dojo.global = { // returns: // The result of the evaluation. Often `undefined` - // note: // - JSC eval() takes an optional second argument which can be 'unsafe'. // - Mozilla/SpiderMonkey eval() takes an optional second argument which is the @@ -565,7 +563,6 @@ dojo.global = { _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -1056,7 +1053,6 @@ dojo.global = { d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"); var ire = new RegExp("^((([^\\[:]+):)?([^@]+)@)?(\\[([^\\]]+)\\]|([^\\[:]*))(:([0-9]+))?$"); @@ -1288,7 +1284,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1471,7 +1466,6 @@ if(typeof window != 'undefined'){ return http.responseText; // String } - var _w = window; var _handleNodeEvent = function(/*String*/evtName, /*Function*/fp){ // summary: @@ -1486,7 +1480,6 @@ if(typeof window != 'undefined'){ }; }; - d._windowUnloaders = []; d.windowUnloaded = function(){ @@ -1636,7 +1629,6 @@ if(typeof window != 'undefined'){ }catch(e){} } - /* OpenAjax.subscribe("OpenAjax", "onload", function(){ if(dojo._inFlightCount == 0){ @@ -1965,7 +1957,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA dojo.declare = function(/*String*/ className, /*Function|Function[]*/ superclass, /*Object*/ props){ @@ -2149,7 +2140,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -2439,7 +2429,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - dojo.Deferred = function(/*Function?*/ canceller){ // summary: // Encapsulates a sequence of callbacks in response to a value that @@ -2723,7 +2712,6 @@ dojo.extend(dojo.Deferred, { } }, - _resback: function(res){ // summary: // The private primitive that means either callback or errback @@ -3236,8 +3224,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - (function(){ var d = dojo; @@ -3434,14 +3420,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - } if(!dojo._hasResource["dojo._base.window"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. @@ -3539,14 +3517,12 @@ dojo.withDoc = function( /*DocumentElement*/documentObject, } }; - } if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -5782,8 +5758,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - (function(){ var d = dojo; @@ -6178,7 +6152,6 @@ dojo.provide("dojo._base.NodeList"); return this; // dojo.NodeList }, - /*===== coords: function(){ // summary: @@ -6522,8 +6495,6 @@ dojo.provide("dojo._base.NodeList"); // see: // http://developer.mozilla.org/en/docs/DOM:element - - // FIXME: need synthetic event support! var _e = { target: n, faux: true, type: evt }; // dojo._event_listener._synthesizeEvent({}, { target: n, faux: true, type: evt }); @@ -6545,8 +6516,6 @@ dojo._hasResource["dojo._base.query"] = true; if(typeof dojo != "undefined"){ dojo.provide("dojo._base.query"); - - } /* @@ -6611,7 +6580,6 @@ if(typeof dojo != "undefined"){ // Global utilities //////////////////////////////////////////////////////////////////////// - // on browsers that support the "children" collection we can avoid a lot of // iteration on chaff (non-element) nodes. // why. @@ -6647,7 +6615,6 @@ if(typeof dojo != "undefined"){ // expression. The structure for parts is documented in the code // below. - // NOTE: // this code is designed to run fast and compress well. Sacrifices // to readibility and maintainability have been made. Your best @@ -6676,7 +6643,6 @@ if(typeof dojo != "undefined"){ // the overall data graph of the full query, as represented by queryPart objects var queryParts = []; - // state keeping vars var inBrackets = -1, inParens = -1, inMatchFor = -1, inPseudo = -1, inClass = -1, inId = -1, inTag = -1, @@ -6750,7 +6716,6 @@ if(typeof dojo != "undefined"){ currentPart.oquery = currentPart.query = ts(pStart, x); // save the full expression as a string - // otag/tag are hints to suggest to the system whether or not // it's an operator or a tag. We save a copy of otag since the // tag name is cast to upper-case in regular HTML matches. The @@ -6928,7 +6893,6 @@ if(typeof dojo != "undefined"){ return queryParts; }; - //////////////////////////////////////////////////////////////////////// // DOM query infrastructure //////////////////////////////////////////////////////////////////////// @@ -7702,7 +7666,6 @@ if(typeof dojo != "undefined"){ // trivially rewrite the query to the form "#synid > .thinger" to // use the QSA branch - if(useQSA){ var tq = (specials.indexOf(query.charAt(query.length-1)) >= 0) ? (query + " *") : query; @@ -8045,10 +8008,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - (function(){ var _d = dojo; function setValue(/*Object*/obj, /*String*/name, /*String*/value){ @@ -8399,8 +8358,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - - dojo._ioSetArgs = function(/*dojo.__IoArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -8790,11 +8747,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - - /* Animation losely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js @@ -9406,15 +9358,6 @@ if(!dojo._hasResource["dojo._base.browser"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.browser"] = true; dojo.provide("dojo._base.browser"); - - - - - - - - - //Need this to be the last code segment in base, so do not place any //dojo.requireIf calls in this file. Otherwise, due to how the build system //puts all requireIf dependencies after the current file, the require calls diff --git a/tests/javascript/frameworks/dojo/dojo-1.4.3.js b/tests/javascript/frameworks/dojo/dojo-1.4.3.js index c88a90843d..e0665ae8cc 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.4.3.js +++ b/tests/javascript/frameworks/dojo/dojo-1.4.3.js @@ -492,7 +492,6 @@ dojo.global = { return !!d.getObject(name, false, obj); // Boolean } - dojo["eval"] = function(/*String*/ scriptFragment){ // summary: // Perform an evaluation in the global scope. Use this rather than @@ -504,7 +503,6 @@ dojo.global = { // returns: // The result of the evaluation. Often `undefined` - // note: // - JSC eval() takes an optional second argument which can be 'unsafe'. // - Mozilla/SpiderMonkey eval() takes an optional second argument which is the @@ -611,7 +609,6 @@ dojo.global = { _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -1194,7 +1191,6 @@ dojo.global = { d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"), ire = new RegExp("^((([^\\[:]+):)?([^@]+)@)?(\\[([^\\]]+)\\]|([^\\[:]*))(:([0-9]+))?$"); @@ -1427,7 +1423,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1614,7 +1609,6 @@ if(typeof window != 'undefined'){ return http.responseText; // String } - var _w = window; var _handleNodeEvent = function(/*String*/evtName, /*Function*/fp){ // summary: @@ -1629,7 +1623,6 @@ if(typeof window != 'undefined'){ }, false); }; - d._windowUnloaders = []; d.windowUnloaded = function(){ @@ -1768,7 +1761,6 @@ if(typeof window != 'undefined'){ } //END DOMContentLoaded - /* OpenAjax.subscribe("OpenAjax", "onload", function(){ if(dojo._inFlightCount == 0){ @@ -2452,9 +2444,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - - - (function(){ var d = dojo, mix = d._mixin, op = Object.prototype, opts = op.toString, xtor = new Function, counter = 0, cname = "constructor"; @@ -2751,7 +2740,6 @@ dojo.provide("dojo._base.declare"); }; } - // chained constructor compatible with the legacy dojo.declare() function singleConstructor(ctor, ctorSpecial){ return function(){ @@ -3430,7 +3418,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -3734,7 +3721,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - dojo.Deferred = function(/*Function?*/ canceller){ // summary: // Encapsulates a sequence of callbacks in response to a value that @@ -4019,7 +4005,6 @@ dojo.extend(dojo.Deferred, { } }, - _resback: function(res){ // summary: // The private primitive that means either callback or errback @@ -4307,8 +4292,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - (function(){ var d = dojo; @@ -4528,14 +4511,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - } if(!dojo._hasResource["dojo._base.window"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. @@ -4637,14 +4612,12 @@ dojo.withDoc = function( /*DocumentElement*/documentObject, } }; - } if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -7101,8 +7074,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - (function(){ var d = dojo; @@ -8089,8 +8060,6 @@ dojo._hasResource["dojo._base.query"] = true; if(typeof dojo != "undefined"){ dojo.provide("dojo._base.query"); - - } /* @@ -8154,7 +8123,6 @@ if(typeof dojo != "undefined"){ // Global utilities //////////////////////////////////////////////////////////////////////// - // on browsers that support the "children" collection we can avoid a lot of // iteration on chaff (non-element) nodes. // why. @@ -8190,7 +8158,6 @@ if(typeof dojo != "undefined"){ // expression. The structure for parts is documented in the code // below. - // NOTE: // this code is designed to run fast and compress well. Sacrifices // to readibility and maintainability have been made. Your best @@ -8219,7 +8186,6 @@ if(typeof dojo != "undefined"){ // the overall data graph of the full query, as represented by queryPart objects var queryParts = []; - // state keeping vars var inBrackets = -1, inParens = -1, inMatchFor = -1, inPseudo = -1, inClass = -1, inId = -1, inTag = -1, @@ -8293,7 +8259,6 @@ if(typeof dojo != "undefined"){ currentPart.oquery = currentPart.query = ts(pStart, x); // save the full expression as a string - // otag/tag are hints to suggest to the system whether or not // it's an operator or a tag. We save a copy of otag since the // tag name is cast to upper-case in regular HTML matches. The @@ -8474,7 +8439,6 @@ if(typeof dojo != "undefined"){ return queryParts; }; - //////////////////////////////////////////////////////////////////////// // DOM query infrastructure //////////////////////////////////////////////////////////////////////// @@ -9263,7 +9227,6 @@ if(typeof dojo != "undefined"){ // trivially rewrite the query to the form "#synid > .thinger" to // use the QSA branch - if(useQSA){ var tq = (specials.indexOf(query.charAt(query.length-1)) >= 0) ? (query + " *") : query; @@ -9606,10 +9569,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - (function(){ var _d = dojo, cfg = _d.config; @@ -10038,7 +9997,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - /*===== dojo.__IoPublish = function(){ // summary: @@ -10078,7 +10036,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - dojo._ioSetArgs = function(/*dojo.__IoArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -10222,7 +10179,6 @@ dojo.provide("dojo._base.xhr"); var _inFlightIntvl = null; var _inFlight = []; - //Use a separate count for knowing if we are starting/stopping io calls. //Cannot use _inFlight.length since it can change at a different time than //when we want to do this kind of test. We only want to decrement the count @@ -10541,10 +10497,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - /* Animation loosely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js @@ -11206,15 +11158,6 @@ if(!dojo._hasResource["dojo._base.browser"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.browser"] = true; dojo.provide("dojo._base.browser"); - - - - - - - - - //Need this to be the last code segment in base, so do not place any //dojo.requireIf calls in this file. Otherwise, due to how the build system //puts all requireIf dependencies after the current file, the require calls diff --git a/tests/javascript/frameworks/dojo/dojo-1.5.0.js b/tests/javascript/frameworks/dojo/dojo-1.5.0.js index 8b7cc207f3..01f02b4828 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.5.0.js +++ b/tests/javascript/frameworks/dojo/dojo-1.5.0.js @@ -598,7 +598,6 @@ dojo.global = { _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -1181,7 +1180,6 @@ dojo.global = { d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"), ire = new RegExp("^((([^\\[:]+):)?([^@]+)@)?(\\[([^\\]]+)\\]|([^\\[:]*))(:([0-9]+))?$"); @@ -1414,7 +1412,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1602,7 +1599,6 @@ if(typeof window != 'undefined'){ return http.responseText; // String } - var _w = window; var _handleNodeEvent = function(/*String*/evtName, /*Function*/fp){ // summary: @@ -1617,7 +1613,6 @@ if(typeof window != 'undefined'){ }, false); }; - d._windowUnloaders = []; d.windowUnloaded = function(){ @@ -1773,7 +1768,6 @@ if(typeof window != 'undefined'){ } //END DOMContentLoaded - /* OpenAjax.subscribe("OpenAjax", "onload", function(){ if(dojo._inFlightCount == 0){ @@ -2457,9 +2451,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - - - (function(){ var d = dojo, mix = d._mixin, op = Object.prototype, opts = op.toString, xtor = new Function, counter = 0, cname = "constructor"; @@ -2781,7 +2772,6 @@ dojo.provide("dojo._base.declare"); }; } - // chained constructor compatible with the legacy dojo.declare() function singleConstructor(ctor, ctorSpecial){ return function(){ @@ -3499,7 +3489,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -3803,7 +3792,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - (function(){ var mutator = function(){}; var freeze = Object.freeze || function(){}; @@ -4001,7 +3989,6 @@ dojo.provide("dojo._base.Deferred"); complete(value); }; - // calling error will indicate that the promise failed this.reject = this.errback = function(error){ // summary: @@ -4287,8 +4274,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - (function(){ var d = dojo; @@ -4508,14 +4493,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - } if(!dojo._hasResource["dojo._base.window"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. @@ -4617,14 +4594,12 @@ dojo.withDoc = function( /*DocumentElement*/documentObject, } }; - } if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -7091,8 +7066,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - (function(){ var d = dojo; @@ -8102,8 +8075,6 @@ dojo._hasResource["dojo._base.query"] = true; if(typeof dojo != "undefined"){ dojo.provide("dojo._base.query"); - - } /* @@ -8167,7 +8138,6 @@ if(typeof dojo != "undefined"){ // Global utilities //////////////////////////////////////////////////////////////////////// - // on browsers that support the "children" collection we can avoid a lot of // iteration on chaff (non-element) nodes. // why. @@ -8203,7 +8173,6 @@ if(typeof dojo != "undefined"){ // expression. The structure for parts is documented in the code // below. - // NOTE: // this code is designed to run fast and compress well. Sacrifices // to readibility and maintainability have been made. Your best @@ -8232,7 +8201,6 @@ if(typeof dojo != "undefined"){ // the overall data graph of the full query, as represented by queryPart objects var queryParts = []; - // state keeping vars var inBrackets = -1, inParens = -1, inMatchFor = -1, inPseudo = -1, inClass = -1, inId = -1, inTag = -1, @@ -8306,7 +8274,6 @@ if(typeof dojo != "undefined"){ currentPart.oquery = currentPart.query = ts(pStart, x); // save the full expression as a string - // otag/tag are hints to suggest to the system whether or not // it's an operator or a tag. We save a copy of otag since the // tag name is cast to upper-case in regular HTML matches. The @@ -8487,7 +8454,6 @@ if(typeof dojo != "undefined"){ return queryParts; }; - //////////////////////////////////////////////////////////////////////// // DOM query infrastructure //////////////////////////////////////////////////////////////////////// @@ -9276,7 +9242,6 @@ if(typeof dojo != "undefined"){ // trivially rewrite the query to the form "#synid > .thinger" to // use the QSA branch - if(useQSA){ var tq = (specials.indexOf(query.charAt(query.length-1)) >= 0) ? (query + " *") : query; @@ -9619,10 +9584,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - (function(){ var _d = dojo, cfg = _d.config; @@ -10051,7 +10012,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - /*===== dojo.__IoPublish = function(){ // summary: @@ -10091,7 +10051,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - dojo._ioSetArgs = function(/*dojo.__IoArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -10235,7 +10194,6 @@ dojo.provide("dojo._base.xhr"); var _inFlightIntvl = null; var _inFlight = []; - //Use a separate count for knowing if we are starting/stopping io calls. //Cannot use _inFlight.length since it can change at a different time than //when we want to do this kind of test. We only want to decrement the count @@ -10554,10 +10512,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - /* Animation loosely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js @@ -11217,15 +11171,6 @@ if(!dojo._hasResource["dojo._base.browser"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.browser"] = true; dojo.provide("dojo._base.browser"); - - - - - - - - - //Need this to be the last code segment in base, so do not place any //dojo.requireIf calls in this file. Otherwise, due to how the build system //puts all requireIf dependencies after the current file, the require calls diff --git a/tests/javascript/frameworks/dojo/dojo-1.6.0.js b/tests/javascript/frameworks/dojo/dojo-1.6.0.js index 9c763d4fe2..09bfc98314 100644 --- a/tests/javascript/frameworks/dojo/dojo-1.6.0.js +++ b/tests/javascript/frameworks/dojo/dojo-1.6.0.js @@ -598,7 +598,6 @@ dojo.global = { _loadNotifying: false }); - dojo._loadPath = function(/*String*/relpath, /*String?*/module, /*Function?*/cb){ // summary: // Load a Javascript module given a relative path @@ -1191,7 +1190,6 @@ dojo.global = { d.i18n._requireLocalization.apply(d.hostenv, arguments); }; - var ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"), ire = new RegExp("^((([^\\[:]+):)?([^@]+)@)?(\\[([^\\]]+)\\]|([^\\[:]*))(:([0-9]+))?$"); @@ -1352,8 +1350,6 @@ dojo.global = { return new d._Url(loc, url); // dojo._Url }; - - })(); /*===== @@ -1426,7 +1422,6 @@ if(typeof window != 'undefined'){ dojo.isBrowser = true; dojo._name = "browser"; - // attempt to figure out the path to dojo if it isn't set in the config (function(){ var d = dojo; @@ -1613,7 +1608,6 @@ if(typeof window != 'undefined'){ return http.responseText; // String } - var _w = window; var _handleNodeEvent = function(/*String*/evtName, /*Function*/fp){ // summary: @@ -1628,7 +1622,6 @@ if(typeof window != 'undefined'){ }, false); }; - d._windowUnloaders = []; d.windowUnloaded = function(){ @@ -1784,7 +1777,6 @@ if(typeof window != 'undefined'){ } //END DOMContentLoaded - /* OpenAjax.subscribe("OpenAjax", "onload", function(){ if(dojo._inFlightCount == 0){ @@ -1824,12 +1816,10 @@ if(dojo.config.debugAtAllCosts){ dojo.require("dojo.i18n"); } - if(!dojo._hasResource["dojo._base.lang"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code. dojo._hasResource["dojo._base.lang"] = true; dojo.provide("dojo._base.lang"); - (function(){ var d = dojo, opts = Object.prototype.toString; @@ -2220,8 +2210,6 @@ if(!dojo._hasResource["dojo._base.array"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.array"] = true; dojo.provide("dojo._base.array"); - - (function(){ var _getParts = function(arr, obj, cb){ return [ @@ -2477,9 +2465,6 @@ if(!dojo._hasResource["dojo._base.declare"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.declare"] = true; dojo.provide("dojo._base.declare"); - - - (function(){ var d = dojo, mix = d._mixin, op = Object.prototype, opts = op.toString, xtor = new Function, counter = 0, cname = "constructor"; @@ -2801,7 +2786,6 @@ dojo.provide("dojo._base.declare"); }; } - // chained constructor compatible with the legacy dojo.declare() function singleConstructor(ctor, ctorSpecial){ return function(){ @@ -3519,8 +3503,6 @@ if(!dojo._hasResource["dojo._base.connect"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.connect"] = true; dojo.provide("dojo._base.connect"); - - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA // low-level delegation machinery @@ -3824,8 +3806,6 @@ if(!dojo._hasResource["dojo._base.Deferred"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.Deferred"] = true; dojo.provide("dojo._base.Deferred"); - - (function(){ var mutator = function(){}; var freeze = Object.freeze || function(){}; @@ -4026,7 +4006,6 @@ dojo.provide("dojo._base.Deferred"); complete(value); }; - // calling error will indicate that the promise failed this.reject = this.errback = function(error){ // summary: @@ -4164,7 +4143,6 @@ if(!dojo._hasResource["dojo._base.json"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.json"] = true; dojo.provide("dojo._base.json"); - dojo.fromJson = function(/*String*/ json){ // summary: // Parses a [JSON](http://json.org) string to return a JavaScript object. @@ -4313,9 +4291,6 @@ if(!dojo._hasResource["dojo._base.Color"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.Color"] = true; dojo.provide("dojo._base.Color"); - - - (function(){ var d = dojo; @@ -4535,7 +4510,6 @@ if(!dojo._hasResource["dojo._base.window"]){ //_hasResource checks added by buil dojo._hasResource["dojo._base.window"] = true; dojo.provide("dojo._base.window"); - /*===== dojo.doc = { // summary: @@ -4637,8 +4611,6 @@ if(!dojo._hasResource["dojo._base.event"]){ //_hasResource checks added by build dojo._hasResource["dojo._base.event"] = true; dojo.provide("dojo._base.event"); - - // this file courtesy of the TurboAjax Group, licensed under a Dojo CLA (function(){ @@ -5279,8 +5251,6 @@ if(!dojo._hasResource["dojo._base.html"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.html"] = true; dojo.provide("dojo._base.html"); - - // FIXME: need to add unit tests for all the semi-public methods try{ @@ -7109,11 +7079,6 @@ if(!dojo._hasResource["dojo._base.NodeList"]){ //_hasResource checks added by bu dojo._hasResource["dojo._base.NodeList"] = true; dojo.provide("dojo._base.NodeList"); - - - - - (function(){ var d = dojo; @@ -8177,7 +8142,6 @@ var defineQuery= function(d){ // Global utilities //////////////////////////////////////////////////////////////////////// - // on browsers that support the "children" collection we can avoid a lot of // iteration on chaff (non-element) nodes. // why. @@ -8213,7 +8177,6 @@ var defineQuery= function(d){ // expression. The structure for parts is documented in the code // below. - // NOTE: // this code is designed to run fast and compress well. Sacrifices // to readability and maintainability have been made. Your best @@ -8242,7 +8205,6 @@ var defineQuery= function(d){ // the overall data graph of the full query, as represented by queryPart objects var queryParts = []; - // state keeping vars var inBrackets = -1, inParens = -1, inMatchFor = -1, inPseudo = -1, inClass = -1, inId = -1, inTag = -1, @@ -8316,7 +8278,6 @@ var defineQuery= function(d){ currentPart.oquery = currentPart.query = ts(pStart, x); // save the full expression as a string - // otag/tag are hints to suggest to the system whether or not // it's an operator or a tag. We save a copy of otag since the // tag name is cast to upper-case in regular HTML matches. The @@ -8497,7 +8458,6 @@ var defineQuery= function(d){ return queryParts; }; - //////////////////////////////////////////////////////////////////////// // DOM query infrastructure //////////////////////////////////////////////////////////////////////// @@ -9286,7 +9246,6 @@ var defineQuery= function(d){ // trivially rewrite the query to the form "#synid > .thinger" to // use the QSA branch - if(useQSA){ var tq = (specials.indexOf(query.charAt(query.length-1)) >= 0) ? (query + " *") : query; @@ -9694,7 +9653,6 @@ var defineAcme= function(){ if(this["dojo"]){ dojo.provide("dojo._base.query"); - defineQuery(this["queryPortability"]||this["acme"]||dojo); }else{ defineQuery(this["queryPortability"]||this["acme"]||defineAcme()); @@ -9711,11 +9669,6 @@ if(!dojo._hasResource["dojo._base.xhr"]){ //_hasResource checks added by build. dojo._hasResource["dojo._base.xhr"] = true; dojo.provide("dojo._base.xhr"); - - - - - (function(){ var _d = dojo, cfg = _d.config; @@ -10144,7 +10097,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - /*===== dojo.__IoPublish = function(){ // summary: @@ -10184,7 +10136,6 @@ dojo.provide("dojo._base.xhr"); } =====*/ - dojo._ioSetArgs = function(/*dojo.__IoArgs*/args, /*Function*/canceller, /*Function*/okHandler, @@ -10328,7 +10279,6 @@ dojo.provide("dojo._base.xhr"); var _inFlightIntvl = null; var _inFlight = []; - //Use a separate count for knowing if we are starting/stopping io calls. //Cannot use _inFlight.length since it can change at a different time than //when we want to do this kind of test. We only want to decrement the count @@ -10647,11 +10597,6 @@ if(!dojo._hasResource["dojo._base.fx"]){ //_hasResource checks added by build. D dojo._hasResource["dojo._base.fx"] = true; dojo.provide("dojo._base.fx"); - - - - - /* Animation loosely package based on Dan Pupius' work, contributed under CLA: http://pupius.co.uk/js/Toolkit.Drawing.js @@ -11311,14 +11256,6 @@ if(!dojo._hasResource["dojo._base.browser"]){ //_hasResource checks added by bui dojo._hasResource["dojo._base.browser"] = true; dojo.provide("dojo._base.browser"); - - - - - - - - //Need this to be the last code segment in base, so do not place any //dojo/requireIf calls in this file/ Otherwise, due to how the build system //puts all requireIf dependencies after the current file, the require calls @@ -11333,16 +11270,6 @@ if(!dojo._hasResource["dojo._base"]){ //_hasResource checks added by build. Do n dojo._hasResource["dojo._base"] = true; dojo.provide("dojo._base"); - - - - - - - - - - } //INSERT dojo.i18n._preloadLocalizations HERE diff --git a/tests/javascript/frameworks/ext/ext-all-2.3.0.js b/tests/javascript/frameworks/ext/ext-all-2.3.0.js index 90fde1bd39..30d3b0476b 100644 --- a/tests/javascript/frameworks/ext/ext-all-2.3.0.js +++ b/tests/javascript/frameworks/ext/ext-all-2.3.0.js @@ -8,7 +8,6 @@ Ext.lib={}; *
* http://extjs.com/license
*/
-
Ext.DomHelper=function(){var tempTableEl=null;var emptyTags=/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i;var tableRe=/^table|tbody|tr|td$/i;var createHtml=function(o){if(typeof o=='string'){return o;} var b="";if(Ext.isArray(o)){for(var i=0,l=o.length;i<l;i++){b+=createHtml(o[i]);} diff --git a/tests/javascript/frameworks/ext/ext-base-2.3.0.js b/tests/javascript/frameworks/ext/ext-base-2.3.0.js index 148fffa0bd..bfb8fc2cbb 100644 --- a/tests/javascript/frameworks/ext/ext-base-2.3.0.js +++ b/tests/javascript/frameworks/ext/ext-base-2.3.0.js @@ -5,7 +5,6 @@ *
* http://extjs.com/license
*/
-
Ext={version:'2.3.0'};window["undefined"]=window["undefined"];Ext.apply=function(o,c,defaults){if(defaults){Ext.apply(o,defaults);} if(o&&c&&typeof c=='object'){for(var p in c){o[p]=c[p];}} diff --git a/tests/javascript/frameworks/jquery/jquery-1.0.4.js b/tests/javascript/frameworks/jquery/jquery-1.0.4.js index 4eaf428449..44e90fab57 100644 --- a/tests/javascript/frameworks/jquery/jquery-1.0.4.js +++ b/tests/javascript/frameworks/jquery/jquery-1.0.4.js @@ -66,18 +66,14 @@ if ( typeof $ != "undefined" ) // Map the jQuery namespace to the '$' one
var $ = jQuery; -
-
jQuery.fn = jQuery.prototype = { jquery: "1.0.4", -
size: function() {
return this.length;
}, -
get: function( num ) {
return num == undefined ?
@@ -108,7 +104,6 @@ jQuery.fn = jQuery.prototype = { return pos;
}, -
attr: function( key, value, type ) {
// Check to see if we're setting style values
return key.constructor != String || value != undefined ?
@@ -134,7 +129,6 @@ jQuery.fn = jQuery.prototype = { jQuery[ type || "attr" ]( this[0], key );
}, -
css: function( key, value ) {
return this.attr( key, value, "curCSS" );
}, @@ -152,7 +146,6 @@ jQuery.fn = jQuery.prototype = { return t;
}, -
wrap: function() {
// The elements to wrap the target around
var a = jQuery.clean(arguments);
@@ -174,28 +167,24 @@ jQuery.fn = jQuery.prototype = { });
}, -
append: function() {
return this.domManip(arguments, true, 1, function(a){
this.appendChild( a );
});
}, -
prepend: function() {
return this.domManip(arguments, true, -1, function(a){
this.insertBefore( a, this.firstChild );
});
}, -
before: function() {
return this.domManip(arguments, false, 1, function(a){
this.parentNode.insertBefore( a, this );
});
}, -
after: function() {
return this.domManip(arguments, false, -1, function(a){
this.parentNode.insertBefore( a, this.nextSibling );
@@ -220,7 +209,6 @@ jQuery.fn = jQuery.prototype = { }), arguments );
}, -
filter: function(t) {
return this.pushStack(
t.constructor == Array &&
@@ -240,14 +228,12 @@ jQuery.fn = jQuery.prototype = { jQuery.filter(t,this).r, arguments );
}, -
not: function(t) {
return this.pushStack( typeof t == "string" ?
jQuery.filter(t,this,false).r :
jQuery.grep(this,function(a){ return a != t; }), arguments );
}, -
add: function(t) {
return this.pushStack( jQuery.merge( this, typeof t == "string" ?
jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments );
@@ -306,7 +292,6 @@ jQuery.fn = jQuery.prototype = { }
}; -
jQuery.extend = jQuery.fn.extend = function() {
// copy reference to target object
var target = arguments[0],
@@ -531,8 +516,7 @@ jQuery.extend({ while ( wrap[0]-- ) div = div.firstChild;
arg = div.childNodes;
}
-
-
+ if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function
for ( var n = 0; n < arg.length; n++ ) // Handles Array, jQuery, DOM NodeList collections
r.push(arg[n]);
@@ -1081,8 +1065,7 @@ jQuery.extend({ }
}
}); -
-
+ /*
* Wheather the W3C compliant box model is being used.
*
@@ -1118,62 +1101,43 @@ jQuery.macros = { insertAfter: "after"
}, -
-
css: "width,height,top,left,position,float,overflow,color,background".split(","), -
-
filter: [ "eq", "lt", "gt", "contains" ],
attr: { -
val: "value", -
html: "innerHTML", -
id: null, -
title: null, -
name: null, -
href: null, -
src: null, -
rel: null
},
axis: { -
parent: "a.parentNode", -
ancestors: jQuery.parents, -
parents: jQuery.parents, -
next: "jQuery.sibling(a).next", -
prev: "jQuery.sibling(a).prev", -
siblings: "jQuery.sibling(a, null, true)", -
children: "jQuery.sibling(a.firstChild)"
},
@@ -1213,7 +1177,6 @@ jQuery.macros = { jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
}, -
remove: function(a){
if ( !a || jQuery.filter( a, [this] ).r )
this.parentNode.removeChild( this );
@@ -1228,7 +1191,6 @@ jQuery.macros = { jQuery.event.add( this, type, fn );
}, -
unbind: function( type, fn ) {
jQuery.event.remove( this, type, fn );
}, diff --git a/tests/javascript/frameworks/jquery/jquery-1.2.6.js b/tests/javascript/frameworks/jquery/jquery-1.2.6.js index 2c04438968..001f9c2afe 100644 --- a/tests/javascript/frameworks/jquery/jquery-1.2.6.js +++ b/tests/javascript/frameworks/jquery/jquery-1.2.6.js @@ -3455,7 +3455,6 @@ jQuery.fn.offset = function() { return results; }; - jQuery.fn.extend({ position: function() { var left = 0, top = 0, results; @@ -3496,7 +3495,6 @@ jQuery.fn.extend({ } }); - // Create scrollLeft and scrollTop methods jQuery.each( ['Left', 'Top'], function(i, name) { var method = 'scroll' + name; diff --git a/tests/javascript/frameworks/jquery/jquery-1.3.2.js b/tests/javascript/frameworks/jquery/jquery-1.3.2.js index de34b8197b..dc46607eb9 100644 --- a/tests/javascript/frameworks/jquery/jquery-1.3.2.js +++ b/tests/javascript/frameworks/jquery/jquery-1.3.2.js @@ -4255,7 +4255,6 @@ jQuery.offset = { } }; - jQuery.fn.extend({ position: function() { var left = 0, top = 0, results; @@ -4296,7 +4295,6 @@ jQuery.fn.extend({ } }); - // Create scrollLeft and scrollTop methods jQuery.each( ['Left', 'Top'], function(i, name) { var method = 'scroll' + name; diff --git a/tests/javascript/frameworks/jquery/jquery-1.4.4.js b/tests/javascript/frameworks/jquery/jquery-1.4.4.js index c53482c802..a4d8843dc1 100644 --- a/tests/javascript/frameworks/jquery/jquery-1.4.4.js +++ b/tests/javascript/frameworks/jquery/jquery-1.4.4.js @@ -909,7 +909,6 @@ return (window.jQuery = window.$ = jQuery); })(); - (function() { jQuery.support = {}; @@ -1104,8 +1103,6 @@ return (window.jQuery = window.$ = jQuery); root = script = div = all = a = null; })(); - - var windowData = {}, rbrace = /^(?:\{.*\}|\[.*\])$/; @@ -1327,9 +1324,6 @@ function dataAttr( elem, key, data ) { return data; } - - - jQuery.extend({ queue: function( elem, type, data ) { if ( !elem ) { @@ -1422,9 +1416,6 @@ jQuery.fn.extend({ } }); - - - var rclass = /[\n\t]/g, rspaces = /\s+/, rreturn = /\r/g, @@ -1631,7 +1622,6 @@ jQuery.fn.extend({ return elem.getAttribute("value") === null ? "on" : elem.value; } - // Everything else, we just grab the value return (elem.value || "").replace(rreturn, ""); @@ -1799,9 +1789,6 @@ jQuery.extend({ } }); - - - var rnamespaces = /\.(.*)$/, rformElems = /^(?:textarea|input|select)$/i, rperiod = /\./g, @@ -2996,7 +2983,6 @@ if ( window.attachEvent && !window.addEventListener ) { }); } - /*! * Sizzle CSS Selector Engine - v1.0 * Copyright 2009, The Dojo Foundation @@ -4318,10 +4304,8 @@ jQuery.text = Sizzle.getText; jQuery.isXMLDoc = Sizzle.isXML; jQuery.contains = Sizzle.contains; - })(); - var runtil = /Until$/, rparentsprev = /^(?:parents|prevUntil|prevAll)/, // Note: This RegExp should be improved, or likely pulled from Sizzle @@ -4618,9 +4602,6 @@ function winnow( elements, qualifier, keep ) { }); } - - - var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, rleadingWhitespace = /^\s+/, rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, @@ -5229,9 +5210,6 @@ function evalScript( i, elem ) { } } - - - var ralpha = /alpha\([^)]*\)/i, ropacity = /opacity=([^)]*)/, rdashAlpha = /-([a-z])/ig, @@ -5562,9 +5540,6 @@ if ( jQuery.expr && jQuery.expr.filters ) { }; } - - - var jsc = jQuery.now(), rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, rselectTextarea = /^(?:select|textarea)/i, @@ -6281,9 +6256,6 @@ if ( window.ActiveXObject ) { // Does this browser support XHR requests? jQuery.support.ajax = !!jQuery.ajaxSettings.xhr(); - - - var elemdisplay = {}, rfxtypes = /^(?:toggle|show|hide)$/, rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/, @@ -6805,9 +6777,6 @@ function defaultDisplay( nodeName ) { return elemdisplay[ nodeName ]; } - - - var rtable = /^t(?:able|d|h)$/i, rroot = /^(?:body|html)$/i; @@ -7019,7 +6988,6 @@ jQuery.offset = { } }; - jQuery.fn.extend({ position: function() { if ( !this[0] ) { @@ -7063,7 +7031,6 @@ jQuery.fn.extend({ } }); - // Create scrollLeft and scrollTop methods jQuery.each( ["Left", "Top"], function( i, name ) { var method = "scroll" + name; @@ -7110,9 +7077,6 @@ function getWindow( elem ) { false; } - - - // Create innerHeight, innerWidth, outerHeight and outerWidth methods jQuery.each([ "Height", "Width" ], function( i, name ) { @@ -7175,5 +7139,4 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { }); - })(window); diff --git a/tests/javascript/frameworks/jquery/jquery-1.5.1.js b/tests/javascript/frameworks/jquery/jquery-1.5.1.js index 7932fc7019..f4145277f3 100644 --- a/tests/javascript/frameworks/jquery/jquery-1.5.1.js +++ b/tests/javascript/frameworks/jquery/jquery-1.5.1.js @@ -1089,7 +1089,6 @@ return jQuery; })(); - (function() { jQuery.support = {}; @@ -1313,8 +1312,6 @@ return jQuery; div = all = a = null; })(); - - var rbrace = /^(?:\{.*\}|\[.*\])$/; jQuery.extend({ @@ -1633,9 +1630,6 @@ function isEmptyDataObject( obj ) { return true; } - - - jQuery.extend({ queue: function( elem, type, data ) { if ( !elem ) { @@ -1732,9 +1726,6 @@ jQuery.fn.extend({ } }); - - - var rclass = /[\n\t\r]/g, rspaces = /\s+/, rreturn = /\r/g, @@ -2121,9 +2112,6 @@ jQuery.extend({ } }); - - - var rnamespaces = /\.(.*)$/, rformElems = /^(?:textarea|input|select)$/i, rperiod = /\./g, @@ -3293,7 +3281,6 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl } }); - /*! * Sizzle CSS Selector Engine * Copyright 2011, The Dojo Foundation @@ -4684,10 +4671,8 @@ jQuery.text = Sizzle.getText; jQuery.isXMLDoc = Sizzle.isXML; jQuery.contains = Sizzle.contains; - })(); - var runtil = /Until$/, rparentsprev = /^(?:parents|prevUntil|prevAll)/, // Note: This RegExp should be improved, or likely pulled from Sizzle @@ -4996,9 +4981,6 @@ function winnow( elements, qualifier, keep ) { }); } - - - var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, rleadingWhitespace = /^\s+/, rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, @@ -5701,9 +5683,6 @@ function evalScript( i, elem ) { } } - - - var ralpha = /alpha\([^)]*\)/i, ropacity = /opacity=([^)]*)/, rdashAlpha = /-([a-z])/ig, @@ -6038,9 +6017,6 @@ if ( jQuery.expr && jQuery.expr.filters ) { }; } - - - var r20 = /%20/g, rbracket = /\[\]$/, rCRLF = /\r?\n/g, @@ -7020,9 +6996,6 @@ function ajaxConvert( s, response ) { return response; } - - - var jsc = jQuery.now(), jsre = /(\=)\?(&|$)|()\?\?()/i; @@ -7101,9 +7074,6 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { } } ); - - - // Install script dataType jQuery.ajaxSetup({ accepts: { @@ -7190,9 +7160,6 @@ jQuery.ajaxTransport( "script", function(s) { } } ); - - - var // #5280: next active xhr id and list of active xhrs' callbacks xhrId = jQuery.now(), xhrCallbacks, @@ -7411,9 +7378,6 @@ if ( jQuery.support.ajax ) { }); } - - - var elemdisplay = {}, rfxtypes = /^(?:toggle|show|hide)$/, rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i, @@ -7939,9 +7903,6 @@ function defaultDisplay( nodeName ) { return elemdisplay[ nodeName ]; } - - - var rtable = /^t(?:able|d|h)$/i, rroot = /^(?:body|html)$/i; @@ -8153,7 +8114,6 @@ jQuery.offset = { } }; - jQuery.fn.extend({ position: function() { if ( !this[0] ) { @@ -8197,7 +8157,6 @@ jQuery.fn.extend({ } }); - // Create scrollLeft and scrollTop methods jQuery.each( ["Left", "Top"], function( i, name ) { var method = "scroll" + name; @@ -8244,9 +8203,6 @@ function getWindow( elem ) { false; } - - - // Create innerHeight, innerWidth, outerHeight and outerWidth methods jQuery.each([ "Height", "Width" ], function( i, name ) { @@ -8311,6 +8267,5 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { }); - window.jQuery = window.$ = jQuery; })(window); diff --git a/tests/javascript/frameworks/mootools/mootools-1.1.2.js b/tests/javascript/frameworks/mootools/mootools-1.1.2.js index 365d2efc77..f4cb62439d 100644 --- a/tests/javascript/frameworks/mootools/mootools-1.1.2.js +++ b/tests/javascript/frameworks/mootools/mootools-1.1.2.js @@ -2938,7 +2938,6 @@ Element.Events = new Abstract({ In addition to the standard javascript events (load, mouseover, mouseout, click, etc.) <Event.js> contains two custom events this event fires when the mouse enters the area of the dom element; will not be fired again if the mouse crosses over children of the element (unlike mouseover) - Example: >$(myElement).addEvent('mouseenter', myFunction); */ @@ -2955,7 +2954,6 @@ Element.Events = new Abstract({ Event: mouseleave this event fires when the mouse exits the area of the dom element; will not be fired again if the mouse crosses over children of the element (unlike mouseout) - Example: >$(myElement).addEvent('mouseleave', myFunction); */ @@ -3015,7 +3013,6 @@ Function.extend({ }); - /* Script: Element.Filters.js add Filters capability to <Elements>. @@ -4715,7 +4712,6 @@ Fx.Transitions.extend({ return 1 - Math.sin(Math.acos(p)); }, - /* Property: Sine displays a sineousidal transition. Must be used as Sine.easeIn or Sine.easeOut or Sine.easeInOut diff --git a/tests/javascript/frameworks/mootools/mootools-1.2.5.js b/tests/javascript/frameworks/mootools/mootools-1.2.5.js index 40dcdc1903..7107846797 100644 --- a/tests/javascript/frameworks/mootools/mootools-1.2.5.js +++ b/tests/javascript/frameworks/mootools/mootools-1.2.5.js @@ -290,7 +290,6 @@ function $unlink(object){ return unlinked; }; - /* --- @@ -440,7 +439,6 @@ Array.implement({ }); - /* --- @@ -535,7 +533,6 @@ String.implement({ }); - /* --- @@ -610,7 +607,6 @@ Function.implement({ }); - /* --- @@ -664,7 +660,6 @@ Number.alias('times', 'each'); Number.implement(methods); })(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']); - /* --- @@ -808,7 +803,6 @@ Hash.implement({ Hash.alias({keyOf: 'indexOf', hasValue: 'contains'}); - /* --- @@ -970,7 +964,6 @@ Class.Mutators = { }; - /* --- @@ -1080,7 +1073,6 @@ var Options = new Class({ }); - /* --- @@ -1248,7 +1240,6 @@ Document.Prototype = {$family: {name: 'document'}}; new Document(document); - /* --- @@ -1972,7 +1963,6 @@ if (Browser.Engine.webkit && Browser.Engine.version < 420) Element.Properties.te } }; - /* --- @@ -2128,7 +2118,6 @@ Element.implement({ }); - Native.implement([Document, Window], { getSize: function(){ @@ -2231,7 +2220,6 @@ Native.implement([Window, Document, Element], { }); - /* --- @@ -2355,7 +2343,6 @@ Event.implement({ }); - /* --- @@ -2519,7 +2506,6 @@ Element.Events = new Hash({ })(); - /* --- @@ -2669,7 +2655,6 @@ Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, bor Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)'; }); - /* --- @@ -2810,7 +2795,6 @@ Fx.compute = function(from, to, delta){ Fx.Durations = {'short': 250, 'normal': 500, 'long': 1000}; - /* --- @@ -2952,7 +2936,6 @@ Fx.CSS.Parsers = new Hash({ }); - /* --- @@ -3031,7 +3014,6 @@ Element.implement({ }); - /* --- @@ -3136,7 +3118,6 @@ Fx.Transitions.extend({ }); }); - /* --- @@ -3241,7 +3222,6 @@ Element.implement({ }); - /* --- @@ -3476,7 +3456,6 @@ Element.implement({ }); - /* --- @@ -3578,7 +3557,6 @@ Element.implement({ }); - /* --- @@ -3635,7 +3613,6 @@ var JSON = new Hash(this.JSON && { }); - /* --- @@ -3672,7 +3649,6 @@ Request.JSON = new Class({ }); - /* --- @@ -3746,7 +3722,6 @@ Cookie.dispose = function(key, options){ return new Cookie(key, options).dispose(); }; - /* --- @@ -3800,7 +3775,6 @@ Element.Events.domready = { })(); - /* --- @@ -4177,7 +4151,6 @@ Selectors.Pseudo = new Hash({ }); - /* --- diff --git a/tests/javascript/frameworks/mootools/mootools-1.3.1.js b/tests/javascript/frameworks/mootools/mootools-1.3.1.js index 76f0c41c50..3b000aa447 100644 --- a/tests/javascript/frameworks/mootools/mootools-1.3.1.js +++ b/tests/javascript/frameworks/mootools/mootools-1.3.1.js @@ -396,11 +396,8 @@ String.extend('uniqueID', function(){ return (UID++).toString(36); }); - - }).call(this); - /* --- @@ -568,9 +565,6 @@ Array.implement({ }); - - - /* --- @@ -654,7 +648,6 @@ String.implement({ }); - /* --- @@ -708,7 +701,6 @@ Number.alias('each', 'times'); Number.implement(methods); })(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']); - /* --- @@ -777,9 +769,6 @@ Function.implement({ }); - - - /* --- @@ -899,9 +888,6 @@ Object.extend({ })(); - - - /* --- @@ -1101,11 +1087,8 @@ try { }); } - - }).call(this); - /* --- @@ -1216,8 +1199,6 @@ Event.Keys = { 'delete': 46 }; - - Event.implement({ stop: function(){ @@ -1238,7 +1219,6 @@ Event.implement({ }); - /* --- @@ -1355,7 +1335,6 @@ Class.Mutators = { }).call(this); - /* --- @@ -1407,8 +1386,6 @@ this.Events = new Class({ addEvent: function(type, fn, internal){ type = removeOn(type); - - this.$events[type] = (this.$events[type] || []).include(fn); if (internal) fn.internal = true; return this; @@ -1476,7 +1453,6 @@ this.Options = new Class({ }).call(this); - /* --- name: Slick.Parser @@ -1708,7 +1684,6 @@ if (!this.Slick) this.Slick = Slick; }).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this); - /* --- name: Slick.Finder @@ -2668,7 +2643,6 @@ if (!this.Slick) this.Slick = Slick; }).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this); - /* --- @@ -2740,8 +2714,6 @@ if (!Browser.Element){ Element.Constructors = {}; - - var IFrame = new Type('IFrame', function(){ var params = Array.link(arguments, { properties: Type.isObject, @@ -2831,8 +2803,6 @@ new Type('Elements', Elements).implement({ }); - - (function(){ // FF, IE @@ -2963,8 +2933,6 @@ Window.implement({ }); - - if (window.$$ == null) Window.implement('$$', function(selector){ if (arguments.length == 1){ if (typeof selector == 'string') return Slick.search(this.document, selector, new Elements); @@ -3042,8 +3010,6 @@ var inserters = { inserters.inside = inserters.bottom; - - var injectCombinator = function(expression, combinator){ if (!expression) return combinator; @@ -3313,8 +3279,6 @@ var contains = {contains: function(element){ if (!document.contains) Document.implement(contains); if (!document.createElement('div').contains) Element.implement(contains); - - [Element, Window, Document].invoke('implement', { addListener: function(type, fn){ @@ -3368,8 +3332,6 @@ if (window.attachEvent && !window.addEventListener) window.addListener('unload', Element.Properties = {}; - - Element.Properties.style = { set: function(style){ @@ -3440,7 +3402,6 @@ Element.Properties.html = (function(){ return html; })(); - /* --- @@ -3599,8 +3560,6 @@ Element.Styles = { zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@' }; - - Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}}; ['Top', 'Right', 'Bottom', 'Left'].each(function(direction){ @@ -3621,7 +3580,6 @@ Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, bor }).call(this); - /* --- @@ -3790,11 +3748,8 @@ Element.Events = { }; - - }).call(this); - /* --- @@ -3977,7 +3932,6 @@ Element.implement({ }); - [Document, Window].invoke('implement', { getSize: function(){ @@ -4079,7 +4033,6 @@ Element.alias({position: 'setPosition'}); //compatability }); - /* --- @@ -4260,7 +4213,6 @@ var pullInstance = function(fps){ }).call(this); - /* --- @@ -4405,9 +4357,6 @@ Fx.CSS.Parsers = { }; - - - /* --- @@ -4512,7 +4461,6 @@ Element.implement({ }); - /* --- @@ -4591,7 +4539,6 @@ Element.implement({ }); - /* --- @@ -4650,8 +4597,6 @@ Fx.Transitions = { }; - - Fx.Transitions.extend = function(transitions){ for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]); }; @@ -4702,7 +4647,6 @@ Fx.Transitions.extend({ }); }); - /* --- @@ -5064,7 +5008,6 @@ Element.implement({ }); - /* --- @@ -5085,8 +5028,6 @@ provides: JSON if (typeof JSON == 'undefined') this.JSON = {}; - - (function(){ var special = {'\b': '\\b', '\t': '\\t', '\n': '\\n', '\f': '\\f', '\r': '\\r', '"' : '\\"', '\\': '\\\\'}; @@ -5140,7 +5081,6 @@ JSON.decode = function(string, secure){ }).call(this); - /* --- @@ -5188,7 +5128,6 @@ Request.JSON = new Class({ }); - /* --- @@ -5264,7 +5203,6 @@ Cookie.dispose = function(key, options){ return new Cookie(key, options).dispose(); }; - /* --- @@ -5374,7 +5312,6 @@ window.addEvent('load', function(){ })(window, document); - /* --- diff --git a/tests/javascript/frameworks/prototype/prototype-1.6.0.js b/tests/javascript/frameworks/prototype/prototype-1.6.0.js index 5c73462946..b09f73ba04 100644 --- a/tests/javascript/frameworks/prototype/prototype-1.6.0.js +++ b/tests/javascript/frameworks/prototype/prototype-1.6.0.js @@ -2171,7 +2171,6 @@ Element._attributeTranslations = { } }; - if (!document.createRange || Prototype.Browser.Opera) { Element.Methods.insert = function(element, insertions) { element = $(element); diff --git a/tests/javascript/frameworks/prototype/prototype-1.7.0.js b/tests/javascript/frameworks/prototype/prototype-1.7.0.js index 474b2231bb..e137917b8d 100644 --- a/tests/javascript/frameworks/prototype/prototype-1.7.0.js +++ b/tests/javascript/frameworks/prototype/prototype-1.7.0.js @@ -60,10 +60,8 @@ var Prototype = { if (Prototype.Browser.MobileSafari) Prototype.BrowserFeatures.SpecificElementExtensions = false; - var Abstract = { }; - var Try = { these: function() { var returnValue; @@ -451,11 +449,8 @@ Object.extend(Function.prototype, (function() { } })()); - - (function(proto) { - function toISOString() { return this.getUTCFullYear() + '-' + (this.getUTCMonth() + 1).toPaddedString(2) + '-' + @@ -465,7 +460,6 @@ Object.extend(Function.prototype, (function() { this.getUTCSeconds().toPaddedString(2) + 'Z'; } - function toJSON() { return this.toISOString(); } @@ -475,7 +469,6 @@ Object.extend(Function.prototype, (function() { })(Date.prototype); - RegExp.prototype.match = RegExp.prototype.test; RegExp.escape = function(str) { @@ -620,7 +613,6 @@ Object.extend(String.prototype, (function() { return this.stripTags().replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&'); } - function toQueryParams(separator) { var match = this.strip().match(/([^?#]*)(#.*)?$/); if (!match) return { }; @@ -1021,14 +1013,6 @@ var Enumerable = (function() { return '#<Enumerable:' + this.toArray().inspect() + '>'; } - - - - - - - - return { each: each, eachSlice: eachSlice, @@ -1071,7 +1055,6 @@ function $A(iterable) { return results; } - function $w(string) { if (!Object.isString(string)) return []; string = string.strip(); @@ -1080,7 +1063,6 @@ function $w(string) { Array.from = $A; - (function() { var arrayProto = Array.prototype, slice = arrayProto.slice, @@ -1146,7 +1128,6 @@ Array.from = $A; }); } - function clone() { return slice.call(this, 0); } @@ -1228,7 +1209,6 @@ var Hash = Class.create(Enumerable, (function() { this._object = Object.isHash(object) ? object.toObject() : Object.clone(object); } - function _each(iterator) { for (var key in this._object) { var value = this._object[key], pair = [key, value]; @@ -1257,8 +1237,6 @@ var Hash = Class.create(Enumerable, (function() { return Object.clone(this._object); } - - function keys() { return this.pluck('key'); } @@ -1420,8 +1398,6 @@ var ObjectRange = Class.create(Enumerable, (function() { }; })()); - - var Ajax = { getTransport: function() { return Try.these( @@ -1655,13 +1631,6 @@ Ajax.Request = Class.create(Ajax.Base, { Ajax.Request.Events = ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; - - - - - - - Ajax.Response = Class.create({ initialize: function(request){ this.request = request; @@ -1814,7 +1783,6 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, { } }); - function $(element) { if (arguments.length > 1) { for (var i = 0, elements = [], length = arguments.length; i < length; i++) @@ -1858,8 +1826,6 @@ if (!Node.ELEMENT_NODE) { }); } - - (function(global) { function shouldUseCache(tagName, attributes) { if (tagName === 'select') return false; @@ -2000,7 +1966,6 @@ Element.Methods = { return isBuggy; })(); - function update(element, content) { element = $(element); var purgeElement = Element._purgeElement; @@ -2230,7 +2195,6 @@ Element.Methods = { } }, - select: function(element) { element = $(element); var expressions = Array.prototype.slice.call(arguments, 1).join(', '); @@ -3057,7 +3021,6 @@ Element.addMethods = function(methods) { Element.cache = { }; }; - document.viewport = { getDimensions: function() { @@ -3098,7 +3061,6 @@ document.viewport = { viewport.getHeight = define.curry('Height'); })(document.viewport); - Element.Storage = { UID: 1 }; @@ -3709,7 +3671,6 @@ Element.addMethods({ return $(document.body); } - function cumulativeOffset(element) { element = $(element); var valueT = 0, valueL = 0; @@ -3873,7 +3834,6 @@ Element.addMethods({ }; } - Element.addMethods({ getLayout: getLayout, measure: measure, @@ -3951,7 +3911,6 @@ Prototype.Selector = (function() { return elements; } - var K = Prototype.K; return { @@ -4936,7 +4895,6 @@ var posProcess = function(selector, context){ return Sizzle.filter( later, tmpSet ); }; - window.Sizzle = Sizzle; })(); @@ -5090,7 +5048,6 @@ Form.Methods = { /*--------------------------------------------------------------------------*/ - Form.Element = { focus: function(element) { $(element).focus(); @@ -5246,7 +5203,6 @@ Form.Element.Serializers = (function() { /*--------------------------------------------------------------------------*/ - Abstract.TimedObserver = Class.create(PeriodicalExecuter, { initialize: function($super, element, frequency, callback) { $super(callback, frequency); @@ -5353,8 +5309,6 @@ Form.EventObserver = Class.create(Abstract.EventObserver, { var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl && 'onmouseleave' in docEl; - - var isIELegacyEvent = function(event) { return false; }; if (window.attachEvent) { @@ -5461,7 +5415,6 @@ Form.EventObserver = Class.create(Abstract.EventObserver, { (docElement.clientTop || 0)); } - function stop(event) { Event.extend(event); event.preventDefault(); @@ -5470,7 +5423,6 @@ Form.EventObserver = Class.create(Abstract.EventObserver, { event.stopped = true; } - Event.Methods = { isLeftClick: isLeftClick, isMiddleClick: isMiddleClick, @@ -5620,7 +5572,6 @@ Form.EventObserver = Class.create(Abstract.EventObserver, { if (Prototype.Browser.WebKit) window.addEventListener('unload', Prototype.emptyFunction, false); - var _getDOMEventName = Prototype.K, translations = { mouseenter: "mouseover", mouseleave: "mouseout" }; @@ -5927,7 +5878,6 @@ var Position = { element.offsetWidth; }, - cumulativeOffset: Element.Methods.cumulativeOffset, positionedOffset: Element.Methods.positionedOffset, diff --git a/tests/javascript/frameworks/yui/yui-3.3.0.js b/tests/javascript/frameworks/yui/yui-3.3.0.js index 78b00d855a..7b4393f68f 100644 --- a/tests/javascript/frameworks/yui/yui-3.3.0.js +++ b/tests/javascript/frameworks/yui/yui-3.3.0.js @@ -495,7 +495,6 @@ proto = { done = Y.Env._attached, len = r.length, loader; - for (i = 0; i < len; i++) { if (!done[r[i]]) { name = r[i]; @@ -503,7 +502,6 @@ proto = { if (!mod) { loader = Y.Env._loader; - if (!loader || !loader.moduleInfo[name]) { Y.message('NOT loaded: ' + name, 'warn', 'yui'); } @@ -724,7 +722,6 @@ proto = { ret = true, data = response.data; - Y._loading = false; if (data) { @@ -763,7 +760,6 @@ proto = { }; - // YUI().use('*'); // bind everything available if (firstArg === '*') { ret = Y._attach(Y.Object.keys(mods)); @@ -773,7 +769,6 @@ proto = { return Y; } - // use loader to expand dependencies and sort the // requirements if it is available. if (boot && Y.Loader && args.length) { @@ -849,7 +844,6 @@ proto = { return Y; }, - /** * Returns the namespace specified and creates it if it doesn't exist * <pre> @@ -994,8 +988,6 @@ proto = { */ }; - - YUI.prototype = proto; // inheritance utilities are not available yet @@ -1028,7 +1020,6 @@ proto = { }()); - /** * The config object contains all of the configuration options for * the YUI instance. This object is supplied by the implementer @@ -1867,7 +1858,6 @@ L.now = Date.now || function () { * @submodule yui-base */ - var Native = Array.prototype, LENGTH = 'length', /** @@ -2177,7 +2167,6 @@ _iefix = function(r, s) { } }; - /** * Returns a new object containing all of the properties of * all the supplied objects. The properties from later objects @@ -2900,14 +2889,11 @@ YUI.Env.parseUA = function(subUA) { return o; }; - Y.UA = YUI.Env.UA || YUI.Env.parseUA(); - }, '3.3.0' ); YUI.add('get', function(Y) { - /** * Provides a mechanism to fetch remote resources and * insert them into a document. @@ -2954,7 +2940,6 @@ Y.Get = function() { */ purging, - /** * Generates an HTML element, this is not appended to a document * @method _node @@ -3136,7 +3121,6 @@ Y.Get = function() { _end(id, 'timeout', 'timeout'); }, - /** * Loads the next item for a given request * @method _next @@ -3191,7 +3175,6 @@ Y.Get = function() { return _next(id); } - if (q.timeout) { // q.timer = L.later(q.timeout, q, _timeout, id); q.timer = setTimeout(function() { @@ -3226,7 +3209,6 @@ Y.Get = function() { h.appendChild(n); } - // FireFox does not support the onload event for link nodes, so // there is no way to make the css requests synchronous. This means // that the css rules in multiple files could be applied out of order @@ -3654,8 +3636,6 @@ Y.Get = function() { }; }(); - - }, '3.3.0' ,{requires:['yui-base']}); YUI.add('features', function(Y) { @@ -3801,7 +3781,6 @@ add('load', '5', { "trigger": "history-hash" }); - }, '3.3.0' ,{requires:['yui-base']}); YUI.add('rls', function(Y) { @@ -3861,8 +3840,6 @@ Y._rls = function(what) { return url; }; - - }, '3.3.0' ,{requires:['get','features']}); YUI.add('intl-base', function(Y) { @@ -3950,7 +3927,6 @@ Y.mix(Y.namespace('Intl'), { } }); - }, '3.3.0' ,{requires:['yui-base']}); YUI.add('yui-log', function(Y) { @@ -4056,7 +4032,6 @@ INSTANCE.message = function() { return INSTANCE.log.apply(INSTANCE, arguments); }; - }, '3.3.0' ,{requires:['yui-base']}); YUI.add('yui-later', function(Y) { @@ -4119,8 +4094,6 @@ Y.later = function(when, o, fn, data, periodic) { Y.Lang.later = Y.later; - - }, '3.3.0' ,{requires:['yui-base']}); YUI.add('yui-throttle', function(Y) { @@ -4162,9 +4135,7 @@ Y.throttle = function(fn, ms) { }); }; - }, '3.3.0' ,{requires:['yui-base']}); - YUI.add('yui', function(Y){}, '3.3.0' ,{use:['yui-base','get','features','rls','intl-base','yui-log','yui-later','yui-throttle']}); diff --git a/tests/javascript/index.php b/tests/javascript/index.php index 3a9b383362..7204f3250e 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -425,7 +425,6 @@ function PiwikTest() { ok( tracker.hook.test._isString(new String), 'isString(String)' ); // String is a string }); - test("AnalyticsTracker alias", function() { expect(1); @@ -433,8 +432,6 @@ function PiwikTest() { equal( typeof tracker.hook.test._encode, 'function', 'encodeWrapper' ); }); - - test("Tracker encode, decode, urldecode wrappers", function() { expect(6); @@ -557,7 +554,6 @@ function PiwikTest() { ok( tracker.hook.test._getProtocolScheme(':') === null, 'unspecified scheme' ); ok( tracker.hook.test._getProtocolScheme('scheme') === null, 'missing colon' ); - equal( typeof tracker.hook.test._resolveRelativeReference, 'function', 'resolveRelativeReference' ); var i, j, data = [ @@ -903,7 +899,6 @@ function PiwikTest() { 'example3.com/current/folder/relative.html' ]]); - Piwik_Overlay_UrlNormalizer.setBaseHref('http://example.com/base/'); test([ @@ -1105,7 +1100,6 @@ if ($sqlite) { ok( campaignName2 == "YEAH", "getAttributionCampaignName()"); ok( campaignKeyword2 == "RIGHT!", "getAttributionCampaignKeyword()"); - // Test visitor ID at the start is the same at the end var visitorIdEnd = tracker.getVisitorId(); ok( visitorIdStart == visitorIdEnd, "tracker.getVisitorId() same at the start and end of process"); @@ -1230,7 +1224,6 @@ if ($sqlite) { window.onerror = oldOnError; // Testing JavaScriptErrorTracking END - stop(); setTimeout(function() { xhr.open("GET", "piwik.php?requests=" + getToken(), false); diff --git a/tests/javascript/jash/Jash.js b/tests/javascript/jash/Jash.js index 45fb379deb..80288a40aa 100644 --- a/tests/javascript/jash/Jash.js +++ b/tests/javascript/jash/Jash.js @@ -169,8 +169,6 @@ function Jash() { return txt; } - - /** * Print simple output to the console * @param {string} text text to print @@ -275,8 +273,6 @@ function Jash() { this.dump(this.outputHistory); } - - /** * Map input keystrokes * @param {int} keyCode number representing keycode of key pressed in event object @@ -438,7 +434,6 @@ function Jash() { var textareaWrap = document.createElement("div"); textareaWrap.id = "JashTextareaWrap"; - /* OUTPUT FIELD */ var debugOutput = document.createElement("textarea"); debugOutput.id = "JashOutput"; @@ -451,7 +446,6 @@ function Jash() { inp.id = "JashInput"; var last = ""; - /* listen for certain keystrokes, map them */ inp.onkeydown = function(e) { e = (typeof window.event != "undefined") ? window.event : e; @@ -630,7 +624,6 @@ function Jash() { textareaWrap.style.width = newWidth + "px"; debugParent.style.width = newWidth + "px"; - var newHeight = originalDims.y + (newMouseDims.y - originMouseDims.y); if(newHeight < self.minDims.y) { newHeight = self.minDims.y; } textareaWrap.style.height = newHeight + "px"; @@ -641,7 +634,6 @@ function Jash() { } } - var bottomBar = document.createElement("div"); bottomBar.id = "JashBottomBar"; @@ -785,7 +777,6 @@ function Jash() { } } - /** * DOM inspection: Show parent node structure, and possibly innerHTML, of node * under mouse cursor. diff --git a/tests/javascript/jslint/jslint.js b/tests/javascript/jslint/jslint.js index fe8a4d86a4..f6e37b8440 100644 --- a/tests/javascript/jslint/jslint.js +++ b/tests/javascript/jslint/jslint.js @@ -299,7 +299,6 @@ var JSLINT = (function () { return object; } - var allowed_option = { bitwise : true, browser : true, @@ -637,7 +636,6 @@ var JSLINT = (function () { // token tx = /^\s*([(){}\[\]\?.,:;'"~#@`]|={1,3}|\/(\*(jslint|properties|property|members?|globals?)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|[\^%]=?|&[&=]?|\|[|=]?|>{1,3}=?|<(?:[\/=!]|\!(\[|--)?|<=?)?|\!(\!|==?)?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+(?:[xX][0-9a-fA-F]+|\.[0-9]*)?(?:[eE][+\-]?[0-9]+)?)/; - function F() {} // Used by Object.create // Provide critical ES5 functions to ES3. @@ -727,7 +725,6 @@ var JSLINT = (function () { }; } - function sanitize(a) { // Escapify a troublesome character. @@ -736,14 +733,12 @@ var JSLINT = (function () { '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4); } - function add_to_predefined(group) { Object.keys(group).forEach(function (name) { predefined[name] = group[name]; }); } - function assume() { if (option.rhino) { add_to_predefined(rhino); @@ -772,7 +767,6 @@ var JSLINT = (function () { } } - // Produce an error warning. function artifact(tok) { @@ -1466,7 +1460,6 @@ klass: do { }; }()); - function add_label(token, kind, name) { // Define the symbol in the current function in the current scope. @@ -1510,7 +1503,6 @@ klass: do { funct[name] = kind; } - function peek(distance) { // Peek ahead to a future token. The distance is how far ahead to look. The @@ -1529,7 +1521,6 @@ klass: do { return found; } - function advance(id, match) { // Produce the next token, also looking for programming errors. @@ -1634,7 +1625,6 @@ klass: do { tokens.push(next_token); } - function do_globals() { var name, writeable; for (;;) { @@ -1666,7 +1656,6 @@ klass: do { } } - function do_jslint() { var name, value; while (next_token.id === '(string)' || next_token.identifier) { @@ -1703,7 +1692,6 @@ klass: do { assume(); } - function do_properties() { var name; option.properties = true; @@ -1729,7 +1717,6 @@ klass: do { } } - directive = function directive() { var command = this.id, old_comments_off = comments_off, @@ -1764,14 +1751,12 @@ klass: do { indent = old_indent; }; - // Indentation intention function edge(mode) { next_token.edge = indent ? indent.open && (mode || 'edge') : ''; } - function step_in(mode) { var open; if (typeof mode === 'number') { @@ -1882,7 +1867,6 @@ klass: do { } } - function semicolon() { if (next_token.id !== ';') { warn_at('expected_a_b', token.line, token.thru, ';', artifact()); @@ -1912,7 +1896,6 @@ klass: do { return false; } - function are_similar(a, b) { if (a === b) { return true; @@ -1966,7 +1949,6 @@ klass: do { return false; } - // This is the heart of JSLINT, the Pratt parser. In addition to parsing, it // is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is // like .nud except that it is only used on the first token of a statement. @@ -2020,7 +2002,6 @@ klass: do { return left; } - // Functional constructors for making the symbols that will be inherited by // tokens. @@ -2051,7 +2032,6 @@ klass: do { return postscript(x); } - function stmt(s, f) { var x = symbol(s); x.identifier = x.reserved = true; @@ -2069,7 +2049,6 @@ klass: do { x.disrupt = true; } - function reserve_name(x) { var c = x.id.charAt(0); if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) { @@ -2078,7 +2057,6 @@ klass: do { return x; } - function prefix(s, f) { var x = symbol(s, 150); reserve_name(x); @@ -2119,7 +2097,6 @@ klass: do { return x; } - function type(s, t, nud) { var x = symbol(s); x.arity = t; @@ -2129,7 +2106,6 @@ klass: do { return x; } - function reserve(s, f) { var x = symbol(s); x.identifier = x.reserved = true; @@ -2139,7 +2115,6 @@ klass: do { return x; } - function constant(name) { var x = reserve(name); x.string = name; @@ -2147,7 +2122,6 @@ klass: do { return x; } - function reservevar(s, v) { return reserve(s, function () { if (typeof v === 'function') { @@ -2157,7 +2131,6 @@ klass: do { }); } - function infix(s, p, f, w) { var x = symbol(s, p); reserve_name(x); @@ -2248,7 +2221,6 @@ klass: do { return node; } - function relation(s, eqeq) { return infix(s, 100, function (left, that) { check_relation(left); @@ -2285,7 +2257,6 @@ klass: do { }); } - function assignop(s, op) { var x = infix(s, 20, function (left, that) { that.first = left; @@ -2334,14 +2305,12 @@ klass: do { return x; } - function bitwise(s, p) { var x = infix(s, p, 'number'); x.bitwise = true; return x; } - function suffix(s) { var x = symbol(s, 150); x.led = function (left) { @@ -2359,7 +2328,6 @@ klass: do { return x; } - function optional_identifier(variable) { if (next_token.identifier) { advance(); @@ -2370,7 +2338,6 @@ klass: do { } } - function identifier(variable) { var i = optional_identifier(variable); if (!i) { @@ -2381,7 +2348,6 @@ klass: do { return i; } - function statement() { var label, old_scope = scope, the_statement; @@ -2456,7 +2422,6 @@ klass: do { return the_statement; } - function statements() { var array = [], disruptor, the_statement; @@ -2492,7 +2457,6 @@ klass: do { return array; } - function block(ordinary) { // array block is array sequence of statements wrapped in braces. @@ -2534,7 +2498,6 @@ klass: do { return array; } - function tally_property(name) { if (option.properties && typeof property[name] !== 'number') { warn('unexpected_property_a', token, name); @@ -2546,7 +2509,6 @@ klass: do { } } - // ECMAScript parser syntax['(identifier)'] = { @@ -2955,7 +2917,6 @@ klass: do { return that; }); - prefix('~', function (that) { no_space_only(); if (!option.bitwise) { @@ -3251,7 +3212,6 @@ klass: do { return that; }, 170); - function property_name() { var id = optional_identifier(); if (!id) { @@ -3266,8 +3226,6 @@ klass: do { return id; } - - assignop('='); assignop('+=', '+'); assignop('-=', '-'); @@ -4003,7 +3961,6 @@ klass: do { return this; }); - // Superfluous reserved words reserve('class'); @@ -4026,7 +3983,6 @@ klass: do { reserve('static'); reserve('yield'); - // Parse JSON function json_value() { @@ -4113,7 +4069,6 @@ klass: do { } } - // The actual JSLINT function itself. itself = function JSLint(the_source, the_option) { @@ -4219,7 +4174,6 @@ klass: do { return JSLINT.errors.length === 0; }; - // Data summary. itself.data = function () { @@ -4360,7 +4314,6 @@ klass: do { return output.join(''); }; - itself.report = function (data) { var dl, i, j, names, output = [], the_function; diff --git a/tests/javascript/piwik.php b/tests/javascript/piwik.php index 26cfa67eb4..856193e330 100644 --- a/tests/javascript/piwik.php +++ b/tests/javascript/piwik.php @@ -35,7 +35,6 @@ if (filesize(dirname(__FILE__).'/unittest.dbf') == 0) } } - if (isset($_GET['requests'])) { $token = get_magic_quotes_gpc() ? stripslashes($_GET['requests']) : $_GET['requests']; $ua = $_SERVER['HTTP_USER_AGENT']; diff --git a/tests/lib/chai-1.9.0/CONTRIBUTING.md b/tests/lib/chai-1.9.0/CONTRIBUTING.md index 69fe27f9c1..de9ab906d2 100644 --- a/tests/lib/chai-1.9.0/CONTRIBUTING.md +++ b/tests/lib/chai-1.9.0/CONTRIBUTING.md @@ -25,8 +25,6 @@ Following these guidelines helps to communicate that you respect the time of the - Additional support is available via the [Google Group](http://groups.google.com/group/chaijs) or on irc.freenode.net#chaijs. - **IMPORTANT**: By submitting a patch, you agree to allow the project owner to license your work under the same license as that used by the project. - - <a name="contributing"></a> ## Contributing diff --git a/tests/lib/chai-1.9.0/ReleaseNotes.md b/tests/lib/chai-1.9.0/ReleaseNotes.md index e8ec49f562..d39f673f10 100644 --- a/tests/lib/chai-1.9.0/ReleaseNotes.md +++ b/tests/lib/chai-1.9.0/ReleaseNotes.md @@ -336,7 +336,6 @@ Thank you to all who took time to contribute! - [#116](https://github.com/chaijs/chai/issues/116): `.throw()` has cleaner display of errors when WebKit browsers. - [#120](https://github.com/chaijs/chai/issues/120): `.eql()` now works to compare dom nodes in browsers. - ### Usage Updates #### For Users diff --git a/tests/lib/chai-1.9.0/chai.js b/tests/lib/chai-1.9.0/chai.js index 8a6339a1c7..80e31b6eef 100644 --- a/tests/lib/chai-1.9.0/chai.js +++ b/tests/lib/chai-1.9.0/chai.js @@ -1242,7 +1242,6 @@ module.exports = function (chai, _) { ); }); - /** * ### .empty * @@ -1735,7 +1734,6 @@ module.exports = function (chai, _) { flag(this, 'object', value); }); - /** * ### .ownProperty(name) * @@ -1859,7 +1857,6 @@ module.exports = function (chai, _) { ); }); - /** * ### .keys(key1, [key2], [...]) * @@ -2249,7 +2246,6 @@ require.register("chai/lib/chai/interface/assert.js", function(exports, require, * MIT Licensed */ - module.exports = function (chai, util) { /*! @@ -3314,7 +3310,6 @@ module.exports = function (chai, util) { }; }; - }); require.register("chai/lib/chai/interface/should.js", function(exports, require, module){ /*! @@ -4005,7 +4000,6 @@ exports.addChainableMethod = require('./addChainableMethod'); exports.overwriteChainableMethod = require('./overwriteChainableMethod'); - }); require.register("chai/lib/chai/utils/inspect.js", function(exports, require, module){ // This is (almost) directly from Node.js utils @@ -4178,7 +4172,6 @@ function formatValue(ctx, value, recurseTimes) { return reduceToSingleString(output, base, braces); } - function formatPrimitive(ctx, value) { switch (typeof value) { case 'undefined': @@ -4202,12 +4195,10 @@ function formatPrimitive(ctx, value) { } } - function formatError(value) { return '[' + Error.prototype.toString.call(value) + ']'; } - function formatArray(ctx, value, recurseTimes, visibleKeys, keys) { var output = []; for (var i = 0, l = value.length; i < l; ++i) { @@ -4227,7 +4218,6 @@ function formatArray(ctx, value, recurseTimes, visibleKeys, keys) { return output; } - function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) { var name, str; if (value.__lookupGetter__) { @@ -4287,7 +4277,6 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) { return name + ': ' + str; } - function reduceToSingleString(output, base, braces) { var numLinesEst = 0; var length = output.reduce(function(prev, cur) { @@ -4673,9 +4662,6 @@ module.exports = function (obj) { }); - - - require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js"); require.alias("chaijs-assertion-error/index.js", "chai/deps/assertion-error/index.js"); require.alias("chaijs-assertion-error/index.js", "assertion-error/index.js"); diff --git a/tests/lib/chai-1.9.0/lib/chai/core/assertions.js b/tests/lib/chai-1.9.0/lib/chai/core/assertions.js index fc1192b258..ef3d50a97c 100644 --- a/tests/lib/chai-1.9.0/lib/chai/core/assertions.js +++ b/tests/lib/chai-1.9.0/lib/chai/core/assertions.js @@ -297,7 +297,6 @@ module.exports = function (chai, _) { ); }); - /** * ### .empty * @@ -790,7 +789,6 @@ module.exports = function (chai, _) { flag(this, 'object', value); }); - /** * ### .ownProperty(name) * @@ -914,7 +912,6 @@ module.exports = function (chai, _) { ); }); - /** * ### .keys(key1, [key2], [...]) * diff --git a/tests/lib/chai-1.9.0/lib/chai/interface/assert.js b/tests/lib/chai-1.9.0/lib/chai/interface/assert.js index 7447802d8b..1a3b3f01b5 100644 --- a/tests/lib/chai-1.9.0/lib/chai/interface/assert.js +++ b/tests/lib/chai-1.9.0/lib/chai/interface/assert.js @@ -4,7 +4,6 @@ * MIT Licensed */ - module.exports = function (chai, util) { /*! diff --git a/tests/lib/chai-1.9.0/lib/chai/utils/inspect.js b/tests/lib/chai-1.9.0/lib/chai/utils/inspect.js index e7ed133171..e19b8aaeeb 100644 --- a/tests/lib/chai-1.9.0/lib/chai/utils/inspect.js +++ b/tests/lib/chai-1.9.0/lib/chai/utils/inspect.js @@ -168,7 +168,6 @@ function formatValue(ctx, value, recurseTimes) { return reduceToSingleString(output, base, braces); } - function formatPrimitive(ctx, value) { switch (typeof value) { case 'undefined': @@ -192,12 +191,10 @@ function formatPrimitive(ctx, value) { } } - function formatError(value) { return '[' + Error.prototype.toString.call(value) + ']'; } - function formatArray(ctx, value, recurseTimes, visibleKeys, keys) { var output = []; for (var i = 0, l = value.length; i < l; ++i) { @@ -217,7 +214,6 @@ function formatArray(ctx, value, recurseTimes, visibleKeys, keys) { return output; } - function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) { var name, str; if (value.__lookupGetter__) { @@ -277,7 +273,6 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) { return name + ': ' + str; } - function reduceToSingleString(output, base, braces) { var numLinesEst = 0; var length = output.reduce(function(prev, cur) { diff --git a/tests/lib/chai-1.9.0/support/sauce/sauce_connect_block.sh b/tests/lib/chai-1.9.0/support/sauce/sauce_connect_block.sh index 126d371097..5c8108d49e 100644 --- a/tests/lib/chai-1.9.0/support/sauce/sauce_connect_block.sh +++ b/tests/lib/chai-1.9.0/support/sauce/sauce_connect_block.sh @@ -1,6 +1,5 @@ #!/bin/bash - # Wait for Connect to be ready before exiting while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do sleep .5 diff --git a/tests/lib/chai-1.9.0/support/sauce/sauce_connect_setup.sh b/tests/lib/chai-1.9.0/support/sauce/sauce_connect_setup.sh index 2c385e18a5..c497d02acb 100644 --- a/tests/lib/chai-1.9.0/support/sauce/sauce_connect_setup.sh +++ b/tests/lib/chai-1.9.0/support/sauce/sauce_connect_setup.sh @@ -30,7 +30,6 @@ rm $CONNECT_DOWNLOAD SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` - ARGS="" # Set tunnel-id only on Travis, to make local testing easier. diff --git a/tests/lib/chai-1.9.0/test/utilities.js b/tests/lib/chai-1.9.0/test/utilities.js index 67f7dc7f6a..4ccc17c431 100644 --- a/tests/lib/chai-1.9.0/test/utilities.js +++ b/tests/lib/chai-1.9.0/test/utilities.js @@ -54,7 +54,6 @@ describe('utilities', function () { }); }); - it('getPathValue', function () { var object = { hello: 'universe' diff --git a/tests/lib/jsdoc-toolkit/app/frame/Chain.js b/tests/lib/jsdoc-toolkit/app/frame/Chain.js index f830796801..a028b5b0c6 100644 --- a/tests/lib/jsdoc-toolkit/app/frame/Chain.js +++ b/tests/lib/jsdoc-toolkit/app/frame/Chain.js @@ -71,7 +71,6 @@ Chain.prototype.joinLeft = function() { return result; } - /* USAGE: var path = "one/two/three.four/five-six"; diff --git a/tests/lib/jsdoc-toolkit/app/frame/Testrun.js b/tests/lib/jsdoc-toolkit/app/frame/Testrun.js index ac2c961282..acd5ca6845 100644 --- a/tests/lib/jsdoc-toolkit/app/frame/Testrun.js +++ b/tests/lib/jsdoc-toolkit/app/frame/Testrun.js @@ -23,7 +23,6 @@ function testrun(testCases) { return testrun.reportOut+"-------------------------------\n"+((testrun.fails>0)? ":( Failed "+testrun.fails+"/" : ":) Passed all ")+testrun.count+" test"+((testrun.count == 1)? "":"s")+".\n"; } - testrun.count = 0; testrun.current = null; testrun.passes = 0; diff --git a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js index 857353265a..5f318ff6f9 100644 --- a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js +++ b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js @@ -14,7 +14,6 @@ JSDOC.PluginManager.registerPlugin = function(/**String*/name, /**Object*/handle */ JSDOC.PluginManager.plugins = {}; - JSDOC.PluginManager.plugins[name] = handlers; } diff --git a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Symbol.js b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Symbol.js index 088496eb9d..807f1406fe 100644 --- a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Symbol.js +++ b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Symbol.js @@ -115,7 +115,6 @@ JSDOC.Symbol.prototype.getMethods = function() { return nonEvents; } - JSDOC.Symbol.prototype.populate = function( /** String */ name, /** Object[] */ params, diff --git a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Walker.js b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Walker.js index cba4b7bc48..8e46a2564e 100644 --- a/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Walker.js +++ b/tests/lib/jsdoc-toolkit/app/lib/JSDOC/Walker.js @@ -49,7 +49,6 @@ JSDOC.Walker.prototype.step = function() { var doc = new JSDOC.DocComment(this.token.data); - if (doc.getTag("exports").length > 0) { var exports = doc.getTag("exports")[0]; @@ -312,7 +311,6 @@ JSDOC.Walker.prototype.step = function() { symbol = new JSDOC.Symbol(name, params, "OBJECT", doc); if (isInner) symbol.isInner = true; - if (doc) JSDOC.Parser.addSymbol(symbol); this.namescope.push(symbol); @@ -334,7 +332,6 @@ JSDOC.Walker.prototype.step = function() { symbol = new JSDOC.Symbol(name, params, "OBJECT", doc); if (isInner) symbol.isInner = true; - if (doc) JSDOC.Parser.addSymbol(symbol); } } @@ -354,7 +351,6 @@ JSDOC.Walker.prototype.step = function() { symbol = new JSDOC.Symbol(name, params, "OBJECT", doc); if (isInner) symbol.isInner = true; - if (doc) JSDOC.Parser.addSymbol(symbol); } // foo: {} @@ -365,7 +361,6 @@ JSDOC.Walker.prototype.step = function() { symbol = new JSDOC.Symbol(name, params, "OBJECT", doc); - if (doc) JSDOC.Parser.addSymbol(symbol); this.namescope.push(symbol); @@ -382,7 +377,6 @@ JSDOC.Walker.prototype.step = function() { symbol = new JSDOC.Symbol(name, params, "OBJECT", doc); - if (doc) JSDOC.Parser.addSymbol(symbol); } // foo(...) diff --git a/tests/lib/jsdoc-toolkit/app/run.js b/tests/lib/jsdoc-toolkit/app/run.js index d26929a8c5..e44893e5b9 100644 --- a/tests/lib/jsdoc-toolkit/app/run.js +++ b/tests/lib/jsdoc-toolkit/app/run.js @@ -103,7 +103,6 @@ FilePath.dir = function(path) { return path.substring(0, nameStart-1); } - importClass(java.lang.System); /** diff --git a/tests/lib/jsdoc-toolkit/app/test/functions_anon.js b/tests/lib/jsdoc-toolkit/app/test/functions_anon.js index 0fdf7c89ad..07a2d4a27f 100644 --- a/tests/lib/jsdoc-toolkit/app/test/functions_anon.js +++ b/tests/lib/jsdoc-toolkit/app/test/functions_anon.js @@ -9,7 +9,6 @@ a = new function() { } } - /** named function executed inline */ diff --git a/tests/lib/jsdoc-toolkit/app/test/jsdoc_test.js b/tests/lib/jsdoc-toolkit/app/test/jsdoc_test.js index 120a186102..3318ea03ca 100644 --- a/tests/lib/jsdoc-toolkit/app/test/jsdoc_test.js +++ b/tests/lib/jsdoc-toolkit/app/test/jsdoc_test.js @@ -9,7 +9,6 @@ * @version 0.1 */ - /** * Construct a new Shape object. * @class This is the basic Shape class. @@ -63,7 +62,6 @@ function Shape(){ function Hexagon(sideLength) { } - /** * This is an unattached (static) function that adds two integers together. * @param {int} One The first number to add @@ -75,7 +73,6 @@ function Add(One, Two){ return One + Two; } - /** * The color of this shape * @type Color @@ -168,7 +165,6 @@ function Rectangle(width, // This is the width } } - /* Inherit from Shape */ Rectangle.prototype = new Shape(); @@ -244,7 +240,6 @@ Rectangle.prototype.getArea = function(){ return width * height; } - /** * Create a new Square instance. * @class A Square is a subclass of {@link Rectangle} @@ -283,7 +278,6 @@ Square.prototype.setHeight = function(height){ this.height = this.width = height; } - /** * Create a new Circle instance based on a radius. * @class Circle class is another subclass of Shape @@ -343,7 +337,6 @@ Circle.createCircle = function(radius){ return new Circle(radius); } - /** * Create a new Coordinate instance based on x and y grid data. * @class Coordinate is a class that can encapsulate location information. @@ -447,7 +440,6 @@ MySingletonShapeFactory = function(){ } - /** * Create a new Foo instance. * @class This is the Foo class. It exists to demonstrate 'nested' classes. diff --git a/tests/lib/jsdoc-toolkit/app/test/memberof_constructor.js b/tests/lib/jsdoc-toolkit/app/test/memberof_constructor.js index 80fde735c3..7cefd72d1b 100644 --- a/tests/lib/jsdoc-toolkit/app/test/memberof_constructor.js +++ b/tests/lib/jsdoc-toolkit/app/test/memberof_constructor.js @@ -14,4 +14,3 @@ Circle.prototype.Tangent = function(){}; */ Circle.prototype.Tangent.prototype.getDiameter = function(){}; - diff --git a/tests/lib/jsdoc-toolkit/app/test/oblit_anon.js b/tests/lib/jsdoc-toolkit/app/test/oblit_anon.js index aa79f99d96..e7693ddd40 100644 --- a/tests/lib/jsdoc-toolkit/app/test/oblit_anon.js +++ b/tests/lib/jsdoc-toolkit/app/test/oblit_anon.js @@ -16,5 +16,3 @@ opt.conf = { base: getBase(this, {p: properties}) } - - diff --git a/tests/lib/jsdoc-toolkit/app/test/shared.js b/tests/lib/jsdoc-toolkit/app/test/shared.js index 7fb4cd3027..8f190c4aec 100644 --- a/tests/lib/jsdoc-toolkit/app/test/shared.js +++ b/tests/lib/jsdoc-toolkit/app/test/shared.js @@ -24,7 +24,6 @@ Array.prototype.filter = function(){}; /**#@-*/ - /** * A first in, first out data structure. * @constructor diff --git a/tests/lib/jsdoc-toolkit/jsrun.sh b/tests/lib/jsdoc-toolkit/jsrun.sh index 74ca79c05e..8c05c62759 100644 --- a/tests/lib/jsdoc-toolkit/jsrun.sh +++ b/tests/lib/jsdoc-toolkit/jsrun.sh @@ -29,7 +29,6 @@ #OTHER DEALINGS IN THE SOFTWARE. # - if [[ -n "$JSDOCDIR" ]]; then _DOCDIR="-Djsdoc.dir=$JSDOCDIR" _APPDIR="$JSDOCDIR/app" diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl index eb1f4681e2..ed5ffa39df 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl @@ -303,7 +303,6 @@ </for> </if> - <if test="data.params.length"> <dl class="detailList"> <dt class="heading">Parameters:</dt> @@ -638,7 +637,6 @@ <hr /> </div> - <!-- ============================== footer ================================= --> <div class="fineprint" style="clear:both"> <if test="JSDOC.opt.D.copyright">©{+JSDOC.opt.D.copyright+}<br /></if> diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/publish.js b/tests/lib/jsdoc-toolkit/templates/jsdoc/publish.js index f716f1abc8..d873073944 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/publish.js +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/publish.js @@ -124,7 +124,6 @@ function publish(symbolSet) { fileindexTemplate = filesIndex = files = null; } - /** Just the first sentence (up to a full stop). Should not break on dotted variable names. */ function summarize(desc) { if (typeof desc != "undefined") diff --git a/tests/lib/mocha-1.17.1/History.md b/tests/lib/mocha-1.17.1/History.md index 1347a2ac7d..db7c60f508 100644 --- a/tests/lib/mocha-1.17.1/History.md +++ b/tests/lib/mocha-1.17.1/History.md @@ -15,7 +15,6 @@ * fix: canonicalize objects before stringifying and diffing them (#1079) * fix: make CR call behave like carriage return for non tty (#1087) - 1.16.2 / 2013-12-23 ================== @@ -23,13 +22,11 @@ * fix: issue running the xunit reporter in browsers (#1068) * fix: issue with firefox < 3.5 (#725) - 1.16.1 / 2013-12-19 ================== * fix: recompiled for missed changes from the last release - 1.16.0 / 2013-12-19 ================== diff --git a/tests/lib/mocha-1.17.1/lib/reporters/base.js b/tests/lib/mocha-1.17.1/lib/reporters/base.js index 0754fe1a37..a0b83a648e 100644 --- a/tests/lib/mocha-1.17.1/lib/reporters/base.js +++ b/tests/lib/mocha-1.17.1/lib/reporters/base.js @@ -330,7 +330,6 @@ function pad(str, len) { return Array(len - str.length + 1).join(' ') + str; } - /** * Returns an inline diff between 2 strings with coloured ANSI output * diff --git a/tests/lib/mocha-1.17.1/lib/runner.js b/tests/lib/mocha-1.17.1/lib/runner.js index deb442e145..a604aeb582 100644 --- a/tests/lib/mocha-1.17.1/lib/runner.js +++ b/tests/lib/mocha-1.17.1/lib/runner.js @@ -391,7 +391,6 @@ Runner.prototype.runTests = function(suite, fn){ , tests = suite.tests.slice() , test; - function hookErr(err, errSuite, after) { // before/after Each hook for errSuite failed: var orig = self.suite; diff --git a/tests/lib/mocha-1.17.1/mocha.js b/tests/lib/mocha-1.17.1/mocha.js index ca536c6468..5fafaa8f5a 100644 --- a/tests/lib/mocha-1.17.1/mocha.js +++ b/tests/lib/mocha-1.17.1/mocha.js @@ -46,7 +46,6 @@ require.relative = function (parent) { }; }; - require.register("browser/debug.js", function(module, exports, require){ module.exports = function(type){ @@ -858,7 +857,6 @@ F.prototype = Runnable.prototype; Hook.prototype = new F; Hook.prototype.constructor = Hook; - /** * Get or set the test `err`. * @@ -2180,7 +2178,6 @@ function pad(str, len) { return Array(len - str.length + 1).join(' ') + str; } - /** * Returns an inline diff between 2 strings with coloured ANSI output * @@ -2355,7 +2352,6 @@ function sameType(a, b) { return a == b; } - }); // module: reporters/base.js require.register("reporters/doc.js", function(module, exports, require){ @@ -3308,7 +3304,6 @@ F.prototype = Base.prototype; List.prototype = new F; List.prototype.constructor = List; - }); // module: reporters/list.js require.register("reporters/markdown.js", function(module, exports, require){ @@ -3448,7 +3443,6 @@ F.prototype = Base.prototype; Min.prototype = new F; Min.prototype.constructor = Min; - }); // module: reporters/min.js require.register("reporters/nyan.js", function(module, exports, require){ @@ -3716,7 +3710,6 @@ F.prototype = Base.prototype; NyanCat.prototype = new F; NyanCat.prototype.constructor = NyanCat; - }); // module: reporters/nyan.js require.register("reporters/progress.js", function(module, exports, require){ @@ -3810,7 +3803,6 @@ F.prototype = Base.prototype; Progress.prototype = new F; Progress.prototype.constructor = Progress; - }); // module: reporters/progress.js require.register("reporters/spec.js", function(module, exports, require){ @@ -3901,7 +3893,6 @@ F.prototype = Base.prototype; Spec.prototype = new F; Spec.prototype.constructor = Spec; - }); // module: reporters/spec.js require.register("reporters/tap.js", function(module, exports, require){ @@ -4057,7 +4048,6 @@ F.prototype = Base.prototype; XUnit.prototype = new F; XUnit.prototype.constructor = XUnit; - /** * Output tag for the given `test.` */ @@ -4167,7 +4157,6 @@ F.prototype = EventEmitter.prototype; Runnable.prototype = new F; Runnable.prototype.constructor = Runnable; - /** * Set & get timeout `ms`. * @@ -4425,7 +4414,6 @@ F.prototype = EventEmitter.prototype; Runner.prototype = new F; Runner.prototype.constructor = Runner; - /** * Run tests with full titles matching `re`. Updates runner.total * with number of tests matched. @@ -4741,7 +4729,6 @@ Runner.prototype.runTests = function(suite, fn){ , tests = suite.tests.slice() , test; - function hookErr(err, errSuite, after) { // before/after Each hook for errSuite failed: var orig = self.suite; @@ -5086,7 +5073,6 @@ F.prototype = EventEmitter.prototype; Suite.prototype = new F; Suite.prototype.constructor = Suite; - /** * Return a clone of this `Suite`. * @@ -5353,7 +5339,6 @@ F.prototype = Runnable.prototype; Test.prototype = new F; Test.prototype.constructor = Test; - }); // module: test.js require.register("utils.js", function(module, exports, require){ diff --git a/tests/lib/mocha-1.17.1/test/reporters/nyan.js b/tests/lib/mocha-1.17.1/test/reporters/nyan.js index 8a54458961..cd6b4a96a8 100644 --- a/tests/lib/mocha-1.17.1/test/reporters/nyan.js +++ b/tests/lib/mocha-1.17.1/test/reporters/nyan.js @@ -1,7 +1,6 @@ var reporters = require('../../').reporters , NyanCat = reporters.Nyan; - describe('nyan face', function () { it('nyan face:(x .x) when "failures" at least one', function () { var nyanCat = new NyanCat({on: function(){}}); diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml index e845d0d44b..9b7e48c592 100644 --- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml +++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml @@ -200,7 +200,6 @@ engine: 'Yahoo! Directory' keywords: 'analytics' - # Bing mobile image search has a special URL #- url: 'http://m.bing.com/search/search.aspx?A=imageresults&Q=piwik&D=Image&MID=8015&SI=0&PN=0&SCO=0' # engine: 'Bing Images' @@ -215,7 +214,6 @@ # engine: 'Yahoo' # keywords: 'piwik' - # InfoSpace - url: 'http://www.infospace.com/search/web?fcoid=417&fcop=topnav&fpid=27&q=piwik&ql=' engine: 'InfoSpace' diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php index 69ed020696..237cf0af59 100644 --- a/tests/resources/staticFileServer.php +++ b/tests/resources/staticFileServer.php @@ -60,7 +60,6 @@ define("WHOLE_TEST_FILE_WITH_RANGE_SRV_MODE", "wholeTestFileWithRange"); define("PARTIAL_BYTE_START", 1204); define("PARTIAL_BYTE_END", 14724); - /** * If the static file server has been requested, the response sent back to the browser will be the content produced by * the execution of Piwik:serverStaticFile(). In this case, unit tests won't be executed |