Merge pull request #18 from jessewebb/dev

Version 0.9.0 Release
jessewebb · Mar 27, 2017 · cbf0f1b · cbf0f1b
2 parents ee59198 + c0bb56a
commit cbf0f1b
Show file tree

Hide file tree

Showing 38 changed files with 5,338 additions and 548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .idea/
+coverage/
 node_modules/
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,16 @@
 # Travis CI configuration
-# http://docs.travis-ci.com/user/customizing-the-build/
-# http://docs.travis-ci.com/user/travis-lint
-# http://docs.travis-ci.com/user/languages/javascript-with-nodejs/
-# http://docs.travis-ci.com/user/gui-and-headless-browsers/
-# http://karma-runner.github.io/0.13/plus/travis.html
-# https://docs.travis-ci.com/user/customizing-the-build/#Whitelisting-or-blacklisting-branches
+# https://docs.travis-ci.com/user/customizing-the-build/
+# https://docs.travis-ci.com/user/customizing-the-build/#Building-Specific-Branches
+# https://docs.travis-ci.com/user/languages/javascript-with-nodejs/
+# https://docs.travis-ci.com/user/travis-lint
 
 branches:
   only:
     - dev
     - gh-pages
 language: node_js
 node_js:
-  - "0.10"
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "4"
 install:
   - "npm install"
 script:

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Jesse Webb
+Copyright (c) 2014-2017 Jesse Webb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # csgo-buynds
 
-Copyright © 2014-2015 Jesse Webb
+Copyright © 2014-2017 Jesse Webb
 
 This code is available under [the MIT License](https://github.com/jessewebb/csgo-buynds/blob/gh-pages/LICENSE).
 
 _Disclaimer:_ This project is currently in **BETA** stages of development.
 
-`Version: 0.8.1`
+`Version: 0.9.0`
 
 [![Build Status](https://travis-ci.org/jessewebb/csgo-buynds.svg?branch=gh-pages)](https://travis-ci.org/jessewebb/csgo-buynds)
 
@@ -68,9 +68,17 @@ Here is a list of which 3rd party libraries are being used:
 - [Bootstrap](http://getbootstrap.com/) (version: 3.3.2)
 - [AngularUI](http://angular-ui.github.io/)
     - [UI Bootstrap](http://angular-ui.github.io/bootstrap/) (version 0.12.0)
+    - [UI Select](http://angular-ui.github.io/ui-select/) (version 0.19.6)
 - [ngClip](https://github.com/asafdav/ng-clip) (version: 0.2.6)
 - [ZeroClipboard](http://zeroclipboard.org/) (version: 2.2.0)
 
-Tests are written with [Jasmine](http://jasmine.github.io/) (version: 2.2.0). [Run the tests](http://csgobuynds.com/tests/SpecRunner.html) in your browser.
+Tests are written with [Jasmine](http://jasmine.github.io/) (version: 2.5.2).
+- You can[run the tests in your browser.](http://csgobuynds.com/tests/SpecRunner.html)
+- Or you can run them from the command line with [Node.js](https://nodejs.org/) and [npm](https://www.npmjs.com/).  
+  ```
+  npm install
+  npm test
+  ```  
+  (The project is configured to use [Karma](http://karma-runner.github.io/) (version: 1.3.0) to run the tests.)
 
 Jesse's preferred JavaScript IDE is [JetBrain's WebStorm](http://www.jetbrains.com/webstorm/).
diff --git a/about.html b/about.html
@@ -151,20 +151,21 @@ <h2 id="development-info">Development Information</h2>
                     <a id="aboutAngularUiLink" href="http://angular-ui.github.io/">AngularUI</a>
                     <ul>
                         <li><a id="aboutAngularUiBootstrapLink" href="http://angular-ui.github.io/bootstrap/">UI Bootstrap</a> (version 0.12.0)</li>
+                        <li><a id="aboutAngularUiSelectLink" href="http://angular-ui.github.io/ui-select/">UI Select</a> (version 0.19.6)</li>
                     </ul>
                 </li>
                 <li><a id="aboutNgClipLink" href="https://github.com/asafdav/ng-clip">ngClip</a> (version: 0.2.6)</li>
                 <li><a id="aboutZeroClipboardLink" href="http://zeroclipboard.org/">ZeroClipboard</a> (version: 2.2.0)</li>
             </ul>
 
-            <p>Tests are written with <a id="aboutJasmineLink" href="http://jasmine.github.io/">Jasmine</a> (version: 2.2.0).</p>
+            <p>Tests are written with <a id="aboutJasmineLink" href="http://jasmine.github.io/">Jasmine</a> (version: 2.5.2).</p>
             <ul>
                 <li>You can <a id="aboutRunTestsLink" href="tests/SpecRunner.html">run the tests in your browser.</a></li>
                 <li>
                     Or you can run them from the command line with <a id="aboutNodeJsLink" href="https://nodejs.org/">Node.js</a>
                     and <a id="aboutNpmLink" href="https://www.npmjs.com/">npm</a>.
                     <pre>npm install&NewLine;npm test</pre>
-                    (The project is configured to use <a id="aboutKarmaLink" href="http://karma-runner.github.io/">Karma</a> (version: 0.13) to run the tests.)
+                    (The project is configured to use <a id="aboutKarmaLink" href="http://karma-runner.github.io/">Karma</a> (version: 1.3.0) to run the tests.)
                 </li>
             </ul>
 
@@ -179,6 +180,20 @@ <h2 id="development-info">Development Information</h2>
         </div>
         <div class="col-md-4">
             <h2 id="release-notes">Release Notes</h2>
+            <div class="panel panel-info">
+                <div class="panel-heading">
+                    <h3 class="panel-title">v0.9.0 (BETA) <em class="pull-right"><small><a href="https://github.com/jessewebb/csgo-buynds/pull/18" target="_blank" title="Release version 0.9.0">Released: 2017-03-26</a></small></em></h3>
+                </div>
+                <div class="panel-body">
+                    <ul>
+                        <li>New Save and Load buttons on Multi-Key Generator allowing 5 custom configurations</li>
+                        <li>Added support to load Binds from built-in presets</li>
+                        <li>MKG now has an 'Auto-Generate' option</li>
+                        <li>Replaced Key and Weapon select boxes with more user-friendly controls</li>
+                        <li>Now Mouse buttons can be used for binds (thanks <a href="https://github.com/bpinkert" target="_blank">bpinkert</a> for PR!)</li>
+                    </ul>
+                </div>
+            </div>
             <div class="panel panel-info">
                 <div class="panel-heading">
                     <h3 class="panel-title">v0.8.1 (BETA) <em class="pull-right"><small><a href="https://github.com/jessewebb/csgo-buynds/pull/11" target="_blank" title="Release version 0.8.1">Released: 2015-12-12</a></small></em></h3>
@@ -251,7 +266,7 @@ <h3 class="panel-title">v0.5 (ALPHA) <em class="pull-right"><small>Released: 201
     </div>
 
     <div class="footer">
-        <span><small>Copyright &copy; 2014-2015 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
+        <span><small>Copyright &copy; 2014-2017 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
     </div>
 </div>
 

diff --git a/buy-binds-generator.html b/buy-binds-generator.html
@@ -16,6 +16,7 @@
     <!-- Styles -->
     <link href="vendor/bootstrap-3.3.2/css/bootstrap.min.css" rel="stylesheet" type="text/css">
     <link href="vendor/bootstrap-3.3.2/css/bootstrap-theme.min.css" rel="stylesheet" type="text/css">
+    <link href="vendor/angular-ui/ui-select-0.19.6/select.min.css" rel="stylesheet" type="text/css">
     <link href="css/app.css" rel="stylesheet" type="text/css">
 
     <!-- Google Analytics -->
@@ -47,7 +48,7 @@
         ga('set', {
             'appName': 'CS:GO Buynds',
             'appId': 'csgo-buynds',
-            'appVersion': '0.8.1'
+            'appVersion': '0.9.0'
         });
     </script>
 </head>
@@ -98,7 +99,7 @@ <h1>CS:GO Buy Binds Generator</h1>
     </div>
 
     <div class="footer">
-        <span><small>Copyright &copy; 2014-2015 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
+        <span><small>Copyright &copy; 2014-2017 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
     </div>
 </div>
 
@@ -107,7 +108,9 @@ <h1>CS:GO Buy Binds Generator</h1>
 <script src="vendor/bootstrap-3.3.2/js/bootstrap.min.js" type="text/javascript"></script>
 <script src="vendor/angular-1.3.12/angular.min.js" type="text/javascript"></script>
 <script src="vendor/angular-1.3.12/angular-route.min.js" type="text/javascript"></script>
+<script src="vendor/angular-1.3.12/angular-sanitize.min.js" type="text/javascript"></script>
 <script src="vendor/angular-ui/ui-bootstrap-0.12.0/ui-bootstrap-tpls-0.12.0.min.js" type="text/javascript"></script>
+<script src="vendor/angular-ui/ui-select-0.19.6/select.min.js" type="text/javascript"></script>
 <script src="vendor/ng-clip-0.2.6/ng-clip.min.js" type="text/javascript"></script>
 <script src="vendor/zeroclipboard-2.2.0/ZeroClipboard.min.js" type="text/javascript"></script>
 

diff --git a/data/bind-presets.json b/data/bind-presets.json
@@ -0,0 +1,7 @@
+[
+  {
+    "id": "preset1",
+    "name": "Gweebz (creator of CSGO-Buynds)",
+    "bindString":"bind \"kp_slash\" \"buy defuser;\"\nbind \"kp_multiply\" \"buy p250;\"\nbind \"kp_minus\" \"buy smokegrenade;\"\nbind \"kp_plus\" \"buy flashbang;\"\nbind \"kp_enter\" \"buy hegrenade;\"\nbind \"kp_del\" \"buy decoy;\"\nbind \"kp_ins\" \"buy deagle;\"\nbind \"kp_home\" \"buy galilar; buy famas;\"\nbind \"kp_uparrow\" \"buy ak47; buy m4a1;\"\nbind \"kp_pgup\" \"buy sg556; buy aug;\"\nbind \"kp_leftarrow\" \"buy mac10; buy mp9;\"\nbind \"kp_end\" \"buy ump45;\"\nbind \"kp_downarrow\" \"buy tec9; buy fiveseven;\"\nbind \"kp_rightarrow\" \"buy ssg08;\"\nbind \"kp_pgdn\" \"buy awp;\"\nbind \"kp_5\" \"buy vest; buy vesthelm;\""
+  }
+]
diff --git a/data/bindable-keys.json b/data/bindable-keys.json
@@ -494,6 +494,46 @@
           "code": null
         }
       ]
+    },
+    {
+      "name": "Mouse Buttons",
+      "keys": [
+        {
+          "name": "Left Mouse",
+          "bind": "mouse1",
+          "code": 223
+        },
+        {
+          "name": "Right Mouse",
+          "bind": "mouse2",
+          "code": 224
+        },
+        {
+          "name": "Middle Mouse",
+          "bind": "mouse3",
+          "code": 225
+        },
+        {
+          "name": "Side Mouse 1",
+          "bind": "mouse4",
+          "code": 226
+        },
+        {
+          "name": "Side Mouse 2",
+          "bind": "mouse5",
+          "code": 227
+        },
+        {
+          "name": "Mouse Wheel Down",
+          "bind": "mwheeldown",
+          "code": 228
+        },
+        {
+          "name": "Mouse Wheel Up",
+          "bind": "mwheelup",
+          "code": 229
+        }
+      ]
     }
   ]
 }
diff --git a/humans.txt b/humans.txt
@@ -8,3 +8,8 @@ Developer: Jesse Webb (a.k.a Gweebz)
 Site: https://github.com/jessewebb
 Twitter: @gweebz
 Location: Saskatoon, Canada
+
+Developer: Benjamin Pinkert
+Site: https://github.com/bpinkert
+Twitter: @WebsiteSavants
+Location: Greenwich, CT
diff --git a/index.html b/index.html
@@ -71,7 +71,7 @@
     <div class="container">
         <div class="row">
             <div class="col-md-8">
-                <h1>CSGO-Buynds <small><span class="label label-info">v0.8.1</span></small></h1>
+                <h1>CSGO-Buynds <small><span class="label label-info">v0.9.0</span></small></h1>
 
                 <h2>CS:GO Buy Binds Generator</h2>
 
@@ -150,27 +150,15 @@ <h3>Disclaimer</h3>
                     <h3>Release Notes</h3>
                     <div class="panel panel-info">
                         <div class="panel-heading">
-                            <h3 class="panel-title">v0.8.1 (BETA) <em class="pull-right"><small><a href="https://github.com/jessewebb/csgo-buynds/pull/11" target="_blank" title="Release version 0.8.1">Released: 2015-12-12</a></small></em></h3>
+                            <h3 class="panel-title">v0.9.0 (BETA) <em class="pull-right"><small><a href="https://github.com/jessewebb/csgo-buynds/pull/18" target="_blank" title="Release version 0.9.0">Released: 2017-03-26</a></small></em></h3>
                         </div>
                         <div class="panel-body">
                             <ul>
-                                <li>Added R8 Revolver</li>
-                                <li>Removed Google AdSense (for now...)</li>
-                                <li>Added sitemap.xml file</li>
-                            </ul>
-                        </div>
-                        <div class="panel-heading">
-                            <h3 class="panel-title">v0.8.0 (BETA) <em class="pull-right"><small><a href="https://github.com/jessewebb/csgo-buynds/pull/10" target="_blank" title="Release version 0.8.0">Released: 2015-12-07</a></small></em></h3>
-                        </div>
-                        <div class="panel-body">
-                            <ul>
-                                <li>New key-recognition control on Single Key Generator (<a href="https://github.com/jessewebb/csgo-buynds/issues/2" target="_blank" title="Better key prompt for single-key generator">feature request #2</a>)</li>
-                                <li>Added Navigation Keys and Function Keys to Multi-Key Generator</li>
-                                <li>New collapsible key sections on Multi-Key Generator</li>
-                                <li>Zeus x27 bind changed to "Taser" (<a href="https://github.com/jessewebb/csgo-buynds/issues/6" target="_blank" title="Zeus buy command no longer works">bug #6</a>, thanks <a href="https://github.com/mike-u" target="_blank">mike-u</a> for PR!)</li>
-                                <li>Added Twitter and Facebook social features</li>
-                                <li>Updated versions of all 3rd party libraries</li>
-                                <li>Added (more) Google Analytics and Google AdSense</li>
+                                <li>New Save and Load buttons on Multi-Key Generator allowing 5 custom configurations</li>
+                                <li>Added support to load Binds from built-in presets</li>
+                                <li>MKG now has an 'Auto-Generate' option</li>
+                                <li>Replaced Key and Weapon select boxes with more user-friendly controls</li>
+                                <li>Now Mouse buttons can be used for binds (thanks <a href="https://github.com/bpinkert" target="_blank">bpinkert</a> for PR!)</li>
                             </ul>
                         </div>
                         <div class="panel-footer">
@@ -194,7 +182,7 @@ <h3 class="panel-title">v0.8.0 (BETA) <em class="pull-right"><small><a href="htt
     </div>
 
     <div class="footer">
-        <span><small>Copyright &copy; 2014-2015 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
+        <span><small>Copyright &copy; 2014-2017 <a id="footerCopyrightGweebzTwitterLink" href="https://twitter.com/gweebz">Jesse 'Gweebz' Webb</a></small></span>
     </div>
 </div>
 

diff --git a/js/app.js b/js/app.js
@@ -5,7 +5,9 @@
 var buyndsApp = angular.module('buyndsApp', [
     'ngRoute',
     'ui.bootstrap',
+    'ui.select',
     'ngClipboard',
+    'ngSanitize',
     'buyndsControllers',
     'buyndsDirectives',
     'buyndsFilters',