Merge pull request #1840 from spadgett/ios-copy

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/util.js

@@ -57,7 +57,7 @@ angular.module('openshiftConsole')
       }
     };
   })
-  .directive('copyToClipboard', function(IS_IOS) {
+  .directive('copyToClipboard', function() {
     return {
       restrict: 'E',
       scope: {
@@ -72,11 +72,6 @@ angular.module('openshiftConsole')
         $scope.id = _.uniqueId('clipboardJs');
       },
       link: function($scope, element) {
-        if (IS_IOS) {
-          $scope.hidden = true;
-          return;
-        }
-
         var nodeElem = $('a', element);
         var node = nodeElem.get(0);
         if ($scope.inputText) {
@@ -89,7 +84,7 @@ angular.module('openshiftConsole')
             .attr('title', 'Copied!')
             .tooltip('fixTitle')
             .tooltip('show')
-            .attr('title', 'Copy to clipboard')
+            .attr('title', 'Copy to Clipboard')
             .tooltip('fixTitle');
           e.clearSelection();
         });
@@ -99,7 +94,7 @@ angular.module('openshiftConsole')
             .attr('title', fallbackMsg)
             .tooltip('fixTitle')
             .tooltip('show')
-            .attr('title', 'Copy to clipboard')
+            .attr('title', 'Copy to Clipboard')
             .tooltip('fixTitle');
         });
         element.on('$destroy', function() {

app/views/directives/_copy-to-clipboard.html

@@ -18,18 +18,24 @@
         data-toggle="tooltip"
         data-placement="left"
         data-container=".middle"
-        title="Copy to clipboard"
+        title="Copy to Clipboard"
         role="button"
-        class="btn btn-default"><i class="fa fa-clipboard"/></a>
+        class="btn btn-default">
+      <i class="fa fa-clipboard" aria-hidden="true"></i>
+      <span class="sr-only">Copy to Clipboard</span>
+    </a>
     <a ng-show="inputText"
         data-clipboard-text="{{clipboardText}}"
         href=""
         ng-disabled="isDisabled"
         data-toggle="tooltip"
         data-placement="left"
         data-container=".middle"
-        title="Copy to clipboard"
+        title="Copy to Clipboard"
         role="button"
-        class="btn btn-default"><i class="fa fa-clipboard"/></a>
+        class="btn btn-default">
+      <i class="fa fa-clipboard" aria-hidden="true"></i>
+      <span class="sr-only">Copy to Clipboard</span>
+    </a>
   </span>
 </div><!-- /input-group -->

dist/scripts/scripts.js

@@ -10336,7 +10336,7 @@ $(this).hide(), $(".reveal-contents", b).show();
 });
 }
 };
-}).directive("copyToClipboard", [ "IS_IOS", function(a) {
+}).directive("copyToClipboard", function() {
 return {
 restrict:"E",
 scope:{
@@ -10350,22 +10350,21 @@ templateUrl:"views/directives/_copy-to-clipboard.html",
 controller:[ "$scope", function(a) {
 a.id = _.uniqueId("clipboardJs");
 } ],
-link:function(b, c) {
-if (a) return void (b.hidden = !0);
-var d = $("a", c), e = d.get(0);
-b.inputText && (e = d.get(1));
-var f = new Clipboard(e);
-f.on("success", function(a) {
-$(a.trigger).attr("title", "Copied!").tooltip("fixTitle").tooltip("show").attr("title", "Copy to clipboard").tooltip("fixTitle"), a.clearSelection();
-}), f.on("error", function(a) {
+link:function(a, b) {
+var c = $("a", b), d = c.get(0);
+a.inputText && (d = c.get(1));
+var e = new Clipboard(d);
+e.on("success", function(a) {
+$(a.trigger).attr("title", "Copied!").tooltip("fixTitle").tooltip("show").attr("title", "Copy to Clipboard").tooltip("fixTitle"), a.clearSelection();
+}), e.on("error", function(a) {
 var b = /Mac/i.test(navigator.userAgent) ? "Press ⌘C to copy" :"Press Ctrl-C to copy";
-$(a.trigger).attr("title", b).tooltip("fixTitle").tooltip("show").attr("title", "Copy to clipboard").tooltip("fixTitle");
-}), c.on("$destroy", function() {
-f.destroy();
+$(a.trigger).attr("title", b).tooltip("fixTitle").tooltip("show").attr("title", "Copy to Clipboard").tooltip("fixTitle");
+}), b.on("$destroy", function() {
+e.destroy();
 });
 }
 };
-} ]).directive("shortId", function() {
+}).directive("shortId", function() {
 return {
 restrict:"E",
 scope:{

dist/scripts/templates.js

@@ -5485,8 +5485,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<input ng-if=\"!multiline\" id=\"{{id}}\" type=\"text\" class=\"form-control\" value=\"{{inputText || clipboardText}}\" ng-disabled=\"isDisabled\" ng-readonly=\"!isDisabled\" select-on-focus>\n" +
     "<pre ng-if=\"multiline\" id=\"{{id}}\">{{inputText || clipboardText}}</pre>\n" +
     "<span ng-class=\"{ 'input-group-btn': !multiline }\" ng-hide=\"hidden\">\n" +
-    "<a ng-show=\"!inputText\" data-clipboard-target=\"#{{id}}\" href=\"\" ng-disabled=\"isDisabled\" data-toggle=\"tooltip\" data-placement=\"left\" data-container=\".middle\" title=\"Copy to clipboard\" role=\"button\" class=\"btn btn-default\"><i class=\"fa fa-clipboard\"/></a>\n" +
-    "<a ng-show=\"inputText\" data-clipboard-text=\"{{clipboardText}}\" href=\"\" ng-disabled=\"isDisabled\" data-toggle=\"tooltip\" data-placement=\"left\" data-container=\".middle\" title=\"Copy to clipboard\" role=\"button\" class=\"btn btn-default\"><i class=\"fa fa-clipboard\"/></a>\n" +
+    "<a ng-show=\"!inputText\" data-clipboard-target=\"#{{id}}\" href=\"\" ng-disabled=\"isDisabled\" data-toggle=\"tooltip\" data-placement=\"left\" data-container=\".middle\" title=\"Copy to Clipboard\" role=\"button\" class=\"btn btn-default\">\n" +
+    "<i class=\"fa fa-clipboard\" aria-hidden=\"true\"></i>\n" +
+    "<span class=\"sr-only\">Copy to Clipboard</span>\n" +
+    "</a>\n" +
+    "<a ng-show=\"inputText\" data-clipboard-text=\"{{clipboardText}}\" href=\"\" ng-disabled=\"isDisabled\" data-toggle=\"tooltip\" data-placement=\"left\" data-container=\".middle\" title=\"Copy to Clipboard\" role=\"button\" class=\"btn btn-default\">\n" +
+    "<i class=\"fa fa-clipboard\" aria-hidden=\"true\"></i>\n" +
+    "<span class=\"sr-only\">Copy to Clipboard</span>\n" +
+    "</a>\n" +
     "</span>\n" +
     "</div>"
   );

dist/scripts/vendor.js

@@ -36836,6 +36836,10 @@ if (c.color || c.backColor) {
 var d = "";
 c.color && (d += "color:" + c.color + ";"), c.backColor && (d += "background-color:" + c.backColor + ";"), b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"]{' + d + "}";
 }
+if (c.iconColor) {
+var d = "color:" + c.iconColor + ";";
+b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"] .node-icon{' + d + "}";
+}
 }, this)), this._css + b;
 }, g.prototype._template = {
 tree:a('<ul class="list-group"></ul>'),