V20190219_0

Gruntfile.js

@@ -53,9 +53,9 @@ module.exports = function (grunt) {
                             "!binary-com-jquery-dialogextended/**", "binary-com-jquery-dialogextended/jquery.dialogextend.min.js",
                             "binary-com-jquery-ui-timepicker/jquery.ui.timepicker.js", "binary-com-jquery-ui-timepicker/jquery.ui.timepicker.css",
                             "binary-com-longcode/dist/main.js",
-                            "binary-style/binary.css",
-                            "binary-style/binary.js",
-                            "binary-style/src/images/favicons/**",
+                            "@binary-com/binary-style/binary.css",
+                            "@binary-com/binary-style/binary.js",
+                            "@binary-com/binary-style/src/images/favicons/**",
                             "!highstock-release/**", "highstock-release/highstock.js", "highstock-release/themes/**", "highstock-release/modules/exporting.js", "highstock-release/modules/offline-exporting.js", "highstock-release/highcharts-more.js",
                             "moment/min/moment.min.js", "moment/locale/**",
                             "text/text.js",
@@ -318,30 +318,6 @@ module.exports = function (grunt) {
                 command: "mkdir beta; mv dist/compressed/* beta; mv beta dist/compressed"
             }
         },
-        if: {
-            live: {
-                // Target-specific file lists and/or options go here.
-                options: {
-                    // execute test function(s)
-                    test() {
-                        return process.env.TRAVIS_BRANCH === "master";
-                    }
-                },
-                //array of tasks to execute if all tests pass
-                ifTrue: [ "gh-pages:travis-deploy" ]
-            },
-            beta: {
-                // Target-specific file lists and/or options go here.
-                options: {
-                    // execute test function(s)
-                    test: function() {
-                        return process.env.TRAVIS_BRANCH === "development";
-                    }
-                },
-                //array of tasks to execute if all tests pass
-                ifTrue: [ "shell:moveEverythingToBETA_folder", "gh-pages:travis-deploy" ]
-            }
-        },
         po2json: {
           options: {
             format: "raw"
@@ -403,4 +379,13 @@ module.exports = function (grunt) {
     grunt.registerTask("deploy-branch", ["default","gitinfo", "clean:current_branch", "copy:copy_current_branch", "gh-pages:deploy-branch"]);
     /* clean all the files in gh-pages branch */
     grunt.registerTask("gh-pages-clean", ["gh-pages:clean"]);
+
+    // conditional switch for deployment
+    grunt.registerTask("deploy", function () {
+        if (process.env.TRAVIS_BRANCH === "master") {
+            grunt.task.run(["gh-pages:travis-deploy"]);
+        } else if (process.env.TRAVIS_BRANCH === "development") {
+            grunt.task.run(["shell:moveEverythingToBETA_folder", "gh-pages:travis-deploy"]);
+        }
+    });
 };

package.json

@@ -25,14 +25,13 @@
     "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-cssmin": "^0.12.2",
-    "grunt-contrib-htmlmin": "^0.4.0",
-    "grunt-contrib-imagemin": "^1.0.1",
+    "grunt-contrib-htmlmin": "^3.0.0",
+    "grunt-contrib-imagemin": "^3.1.0",
     "grunt-contrib-jshint": "^1.1.0",
-    "grunt-contrib-uglify": "^0.8.0",
+    "grunt-contrib-uglify": "^4.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-gh-pages": "^2.0.0",
+    "grunt-gh-pages": "^3.1.0",
     "grunt-gitinfo": "^0.1.7",
-    "grunt-if": "^0.1.5",
     "grunt-newer": "^1.2.0",
     "grunt-po2json": "^0.3.0",
     "grunt-remove-logging": "ehynds/grunt-remove-logging",
@@ -43,7 +42,7 @@
     "lodash": "^4.17.5"
   },
   "scripts": {
-    "deploy-gh-pages": "grunt if:live if:beta",
+    "deploy-gh-pages": "grunt deploy",
     "start": "grunt && concurrently -k \"grunt watch\" \"grunt connect\"",
     "watch": "grunt watch",
     "server": "grunt connect",
@@ -71,10 +70,11 @@
     "url": "https://github.com/binary-com/webtrader/issues"
   },
   "dependencies": {
+    "@binary-com/binary-style": "^0.2.15",
+    "@binary-com/webtrader-charts": "0.5.2",
     "alameda": "^1.2.0",
     "binary-com-jquery-dialogextended": "binary-com/jquery-dialogextend#master",
     "binary-com-jquery-ui-timepicker": "^1.0.1",
-    "binary-style": "^0.2.4",
     "chosen-js": "^1.6.2",
     "clipboard": "^1.7.1",
     "datatables.net": "^1.10.15",
@@ -94,8 +94,7 @@
     "require-css": "^0.1.10",
     "rivets": "0.8.1",
     "text": "requirejs/text",
-    "vanderlee-colorpicker": "^1.2.13",
-    "@binary-com/webtrader-charts": "0.5.2"
+    "vanderlee-colorpicker": "^1.2.13"
   },
   "contributors": [
     {

src/common/rivetsExtra.es6

@@ -432,6 +432,10 @@ rv.binders.slider = {
    }
 }
 
+rv.binders.datepicker_mindate = {
+   routine: (el, value) => $(el).datepicker('option', 'minDate', value)
+}
+
 /* trun input element in jquery-ui-datepicker */
 rv.binders.datepicker = {
    priority: 94,

src/main.css

@@ -96,6 +96,10 @@ div.ui-tooltip { /* override default jquery ui max tooltip width */
     outline: 0;
 }
 
+ul.ui-widget.ui-widget-content {
+    border: 1px solid #f2f2f2;
+}
+
 .ui-dialog .ui-dialog-content {
     padding: .5em .5em;
     padding-bottom: 0;
@@ -378,7 +382,7 @@ a.ui-state-default.ui-state-hover {
 	background: #dedede;
 }
 .ui-widget.ui-widget-content {
-    border: 1px solid #c5c5c5;
+    border: unset;
 }
 .ui-datepicker-close {
 	display: none;
@@ -439,6 +443,9 @@ button.ui-datepicker-current {
 .ui-timepicker-title {
 	text-align: center;
 }
+.ui-timepicker-close {
+	display: none;
+}
 .ui-timepicker td {
 	border: none;
 }
@@ -585,6 +592,10 @@ label.checkbox input:checked ~ span.check {
     transform: scale(1) rotate(45deg);
 }
 
+.logo-parent {
+    padding: 6px 8px !important;
+}
+
 .chosen-disable {
     width: 100%;
     height: 29px;
@@ -593,13 +604,16 @@ label.checkbox input:checked ~ span.check {
 }
 
 .ui-icon-caret-1-e {
-    background-image: url('./images/single-angle-pointing-to-right.svg') !important;
-    background-size: 12px 10px !important;
-    background-position: 2px 5px !important;
-    margin: 0 !important;
-    top: calc(50% - 10px) !important;
-    right: 2px !important;
-    left: auto;
+    left: auto !important;
+}
+
+.ui-icon-caret-1-e:after {
+    content: "»";
+    font-family: roboto, sans-serif !important;
+    font-size: 16px;
+    font-weight: bold;
+    left: 25% !important;
+    top: 50% !important;
 }
 
 .ui-dialog-titlebar {

src/main.js

@@ -23,7 +23,7 @@ window.requirejs.config({
         "moment-locale":"lib/moment/locale",
         "clipboard": "lib/clipboard/dist/clipboard.min",
         "indicator_levels": "charts/indicators/level",
-        "binary-style": "lib/binary-style/binary",
+        "binary-style": "lib/@binary-com/binary-style/binary",
         "babel-runtime/regenerator": "lib/regenerator-runtime/runtime",
         "webtrader-charts" : "lib/@binary-com/webtrader-charts/dist/webtrader-charts.iife",
         "chosen": "lib/chosen-js/chosen.jquery",