Merge branch 'develop'

Author: Invis1ble

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Invis1ble.
+Copyright (c) 2013-2016 Invis1ble.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "invis1ble/scrollbox",
     "description": "A lightweight jQuery custom scrollbar plugin, that triggers event when reached the defined point.",
-    "version": "3.0.0-beta.4",
+    "version": "3.0.0-rc.0",
     "type": "component",
     "keywords": [
         "jquery",

dist/css/scrollbox.css

@@ -1,5 +1,5 @@
 /*!
- * Scrollbox v3.0.0-beta.4
+ * Scrollbox v3.0.0-rc.0
  * (c) 2013-2016, Max Invis1ble
  * Licensed under MIT (https://opensource.org/licenses/mit-license.php)
  */

dist/css/scrollbox.min.css

@@ -7,15 +7,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 /*!
- * Scrollbox v3.0.0-beta.4
+ * Scrollbox v3.0.0-rc.0
  * (c) 2013-2016, Max Invis1ble
  * Licensed under MIT (https://opensource.org/licenses/mit-license.php)
  */
 
 var Scrollbox = function ($) {
 
     var NAME = 'scrollbox';
-    var VERSION = '3.0.0-beta.4';
+    var VERSION = '3.0.0-rc.0';
     var DATA_KEY = NAME;
     var JQUERY_NO_CONFLICT = $.fn[NAME];
 

dist/js/scrollbox.js

@@ -1,7 +1,7 @@
 {
   "name": "scrollbox",
   "description": "A lightweight jQuery custom scrollbar plugin, that triggers event when reached the defined point.",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-rc.0",
   "author": "Max Invis1ble",
   "keywords": [
     "jquery-plugin",

dist/js/scrollbox.min.js

@@ -1,13 +1,13 @@
 /*!
- * Scrollbox v3.0.0-beta.4
+ * Scrollbox v3.0.0-rc.0
  * (c) 2013-2016, Max Invis1ble
  * Licensed under MIT (https://opensource.org/licenses/mit-license.php)
  */
 
 const Scrollbox = (($) => {
 
     const NAME               = 'scrollbox';
-    const VERSION            = '3.0.0-beta.4';
+    const VERSION            = '3.0.0-rc.0';
     const DATA_KEY           = NAME;
     const JQUERY_NO_CONFLICT = $.fn[NAME];
 

dist/js/scrollbox.min.js.map

@@ -1,5 +1,5 @@
 /*!
- * Scrollbox v3.0.0-beta.4
+ * Scrollbox v3.0.0-rc.0
  * (c) 2013-2016, Max Invis1ble
  * Licensed under MIT (https://opensource.org/licenses/mit-license.php)
  */

package.json

@@ -1,4 +1,69 @@
 [
+    # OS X 10.11
+    {
+        browserName: 'safari',
+        platform: 'OS X 10.11'
+    },
+    {
+        browserName: 'chrome',
+        platform: 'OS X 10.11'
+    },
+    {
+        browserName: 'firefox',
+        platform: 'OS X 10.11'
+    },
+
+    # OS X 10.10
+    {
+        browserName: 'safari',
+        platform: 'OS X 10.10'
+    },
+    {
+        browserName: 'chrome',
+        platform: 'OS X 10.10'
+    },
+    {
+        browserName: 'firefox',
+        platform: 'OS X 10.10'
+    },
+    {
+        browserName: "iphone",
+        version: "9.2",
+        platform: "OS X 10.10"
+    },
+
+    # Linux
+    {
+        browserName: 'chrome',
+        platform: 'Linux'
+    },
+    {
+        browserName: 'chrome',
+        version: '26',
+        platform: 'Linux'
+    },
+    {
+        browserName: 'firefox',
+        platform: 'Linux'
+    },
+    {
+        browserName: 'firefox',
+        version: '6',
+        platform: 'Linux'
+    },
+    {
+        browserName: 'opera',
+        version: '12',
+        platform: 'Linux'
+    },
+    {
+        browserName: "android",
+        version: "latest",
+        deviceType: "phone",
+        deviceName: "Android Emulator",
+        platform: "Linux"
+    },
+
     # Windows 10
     {
         browserName: 'chrome',
@@ -121,70 +186,5 @@
         browserName: 'opera',
         version: '11',
         platform: 'Windows XP'
-    },
-
-    # OS X 10.11
-    {
-        browserName: 'safari',
-        platform: 'OS X 10.11'
-    },
-    {
-        browserName: 'chrome',
-        platform: 'OS X 10.11'
-    },
-    {
-        browserName: 'firefox',
-        platform: 'OS X 10.11'
-    },
-
-    # OS X 10.10
-    {
-        browserName: 'safari',
-        platform: 'OS X 10.10'
-    },
-    {
-        browserName: 'chrome',
-        platform: 'OS X 10.10'
-    },
-    {
-        browserName: 'firefox',
-        platform: 'OS X 10.10'
-    },
-    {
-        browserName: "iphone",
-        version: "9.2",
-        platform: "OS X 10.10"
-    },
-
-    # Linux
-    {
-        browserName: 'chrome',
-        platform: 'Linux'
-    },
-    {
-        browserName: 'chrome',
-        version: '26',
-        platform: 'Linux'
-    },
-    {
-        browserName: 'firefox',
-        platform: 'Linux'
-    },
-    {
-        browserName: 'firefox',
-        version: '6',
-        platform: 'Linux'
-    },
-    {
-        browserName: 'opera',
-        version: '12',
-        platform: 'Linux'
-    },
-    {
-        browserName: "android",
-        version: "latest",
-        deviceType: "phone",
-        deviceName: "Android Emulator",
-        platform: "Linux"
     }
 ]