Fixed invalid 'cursor: hand' CSS property

emweb · Jun 23, 2022 · f5b535e · f5b535e
1 parent 08e24b6
commit f5b535e
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 44 deletions.
diff --git a/examples/blog/css/blog.css b/examples/blog/css/blog.css
@@ -17,7 +17,7 @@
 
 .link {
   text-decoration: underline;
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
 }
 
 .invalid {

diff --git a/examples/composer/composer.css b/examples/composer/composer.css
@@ -18,7 +18,7 @@ body, td, button {
 }
 
 .option {
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   color: blue;
   font-size: smaller;
   text-decoration: underline;
@@ -50,7 +50,7 @@ button.default {
 }
 
 .remove {
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   color: blue;
   font-size: x-small;
   text-decoration: underline;

diff --git a/examples/feature/auth1/css/style.css b/examples/feature/auth1/css/style.css
@@ -8,7 +8,6 @@ body {
 
 .Wt-auth-icon {
     cursor: pointer;
-    cursor: hand;
     padding-left: 4px;
     padding-right: 4px;
 }

diff --git a/examples/feature/auth2/css/style.css b/examples/feature/auth2/css/style.css
@@ -9,7 +9,6 @@ body {
 
 .Wt-auth-icon {
     cursor: pointer;
-    cursor: hand;
     padding-left: 4px;
     padding-right: 4px;
 }
diff --git a/examples/feature/saml/css/style.css b/examples/feature/saml/css/style.css
@@ -1,4 +1,3 @@
 .Wt-auth-icon {
   cursor: pointer;
-  cursor: hand;
 }
diff --git a/examples/filetreetable/filetree.css b/examples/filetreetable/filetree.css
@@ -3,7 +3,7 @@ body {
 }
 
 .treenodelabel {
-  cursor:pointer;cursor:hand;
+  cursor:pointer;
 }
 
 .selected {

diff --git a/examples/qrlogin/css/style.css b/examples/qrlogin/css/style.css
@@ -9,5 +9,4 @@ body {
 
 .Wt-auth-icon {
     cursor: pointer;
-    cursor: hand;
 }
diff --git a/examples/widgetgallery/docroot/style/everywidget.css b/examples/widgetgallery/docroot/style/everywidget.css
@@ -106,7 +106,7 @@ span.doc a:hover {
 span.reactive {
     display: block;
     background-color: #CCCCCC;
-    cursor: pointer;cursor:hand;
+    cursor: pointer;
     margin: 3px 0px;
 }
 

diff --git a/resources/form.css b/resources/form.css
@@ -83,7 +83,7 @@
 
 .Wt-form .Wt-buttons span {
     text-decoration: underline;
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
 }
 
 .Wt-form .Wt-error {

diff --git a/resources/themes/default/wt.css b/resources/themes/default/wt.css
@@ -123,15 +123,15 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 }
 
 .Wt-cal caption select {
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   margin: 2px 0px;
   vertical-align: middle;
 }
 
 .Wt-cal-navbutton {
   color: #FFFFFF;
   background-color:#6699CC;
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   margin: 3px;
   vertical-align: middle;
   display: block;
@@ -162,7 +162,7 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
   color: #003DB8;
   border-right: 1px solid #E0E0E0;
   border-bottom: 1px solid #E0E0E0;
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   text-align: center;
 }
 
@@ -525,12 +525,12 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 }
 
 .Wt-slider-h .handle {
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   background: url(slider-thumb-h.gif) no-repeat scroll center bottom;
 }
 
 .Wt-slider-v .handle {
-  cursor: pointer; cursor: hand;
+  cursor: pointer;
   background: url(slider-thumb-v.gif) no-repeat scroll right center;
 }
 
@@ -629,7 +629,7 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
   background: transparent url(../../tab_r.gif) no-repeat scroll right top;
   border-bottom:1px solid #84B0C7;
   float:left; display:block;
-  cursor:pointer;cursor:hand;
+  cursor:pointer;
   font-size: small; font-weight: bold;
 }
 
@@ -850,7 +850,6 @@ body.Wt-rtl .Wt-itemview div.Wt-tv-no-rh {
   height: 16px;
   padding-bottom: 6px;
   cursor: pointer;
-  cursor:hand;
 }
 
 .Wt-itemview .Wt-disabled .Wt-tv-sh {

diff --git a/resources/themes/polished/wt.css b/resources/themes/polished/wt.css
@@ -124,14 +124,14 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 }
 
 .Wt-cal-navbutton {
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     font: bold 20px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
     vertical-align: middle;
     display: block;
 }
 
 .Wt-cal caption select {
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     font: 12px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
     margin: 2px 0px;
     vertical-align: middle;
@@ -476,7 +476,7 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 .Wt-btn {
     background: transparent url(gradient.png) repeat-x scroll 0 0;
     border: 1px outset #CCC;
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     font-size: small;
     margin: 0px 2px;
     padding: 2px 5px;
@@ -566,12 +566,12 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 }
 
 .Wt-slider-h .handle {
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     background: url(slider-thumb.png) no-repeat scroll center;
 }
 
 .Wt-slider-v .handle {
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     background: url(slider-thumb.png) no-repeat scroll center;
 }
 
@@ -698,7 +698,7 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
 }
 
 .Wt-tabs li {
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
     display: block;
     white-space: nowrap;
     float: left;
@@ -910,7 +910,7 @@ body.Wt-rtl .Wt-itemview .Wt-tv-no-rh {
     width: 16px;
     height: 16px;
     padding-bottom: 6px;
-    cursor: pointer; cursor: hand;
+    cursor: pointer;
 }
 
 .Wt-itemview .Wt-disabled .Wt-tv-sh {

diff --git a/src/Wt/WApplication.C b/src/Wt/WApplication.C
@@ -225,7 +225,7 @@ WApplication::WApplication(const WEnvironment& env
                       "margin: 0px;"
                       "padding: 0px;"
                       "font: inherit; "
-                      "cursor: pointer; cursor: hand;"
+                      "cursor: pointer;"
                       "background: transparent;"
                       "text-decoration: none;"
                       "color: inherit;");

diff --git a/src/web/DomElement.C b/src/web/DomElement.C
@@ -696,27 +696,23 @@ std::string DomElement::cssStyle() const
       styleProperty = &j->second;
     else if ((p >= static_cast<unsigned int>(Property::StylePosition)) &&
              (p < static_cast<unsigned int>(Property::LastPlusOne))) {
-      if ((j->first == Property::StyleCursor) && (j->second == "pointer")) {
-        style << "cursor:pointer;cursor:hand;";
-      } else {
-        if (!j->second.empty()) {
+      if (!j->second.empty()) {
+        style << cssNames_[p -
+                            static_cast<unsigned int>(Property::StylePosition)]
+              << ':' << j->second << ';';
+        if (p >= static_cast<unsigned int>(Property::StyleBoxSizing)) {
+          WApplication *app = WApplication::instance();
+
+          if (app) {
+            if (app->environment().agentIsGecko())
+              style << "-moz-";
+            else if (app->environment().agentIsWebKit())
+              style << "-webkit-";
+          }
+
           style << cssNames_[p -
-                             static_cast<unsigned int>(Property::StylePosition)]
+                              static_cast<unsigned int>(Property::StylePosition)]
                 << ':' << j->second << ';';
-          if (p >= static_cast<unsigned int>(Property::StyleBoxSizing)) {
-            WApplication *app = WApplication::instance();
-
-            if (app) {
-              if (app->environment().agentIsGecko())
-                style << "-moz-";
-              else if (app->environment().agentIsWebKit())
-                style << "-webkit-";
-            }
-
-            style << cssNames_[p -
-                               static_cast<unsigned int>(Property::StylePosition)]
-                  << ':' << j->second << ';';
-          }
         }
       }
     } else if (j->first == Property::StyleWidthExpression) {