Some cosmetic changes for the deprecated code

thexerteproject · Mar 1, 2015 · ca65a13 · ca65a13
1 parent 54bbf8c
commit ca65a13
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/editor/css/complex.css b/editor/css/complex.css
@@ -472,10 +472,6 @@ img.optional {
 	cursor: pointer;
 }
 
-img.deprecated {
-    cursor: pointer;
-}
-
 span.deprecated {
     padding: 0 4px 0 4px;
     background: rgba(248, 103, 24, 0.33);
@@ -485,7 +481,7 @@ td.wizarddeprecated {
     background: rgba(248, 103, 24, 0.33);
 }
 
-td.flashonly {
+td.flashonly, td.deprecated{
     width: 32px;
 }
 

diff --git a/editor/js/toolbox.js b/editor/js/toolbox.js
@@ -279,6 +279,13 @@ var EDITOR = (function ($, parent) {
                         .attr('src', 'editor/img/deprecated.png')
                         .attr('title', options.deprecated)
                         .addClass("deprecated"));
+                if (options.optional == 'true') {
+                    var opt = $('<img>')
+                            .attr('id', 'optbtn_' + name)
+                            .attr('src', 'editor/img/optional.png')
+                            .addClass("optional");
+                    td.append(opt);
+                }
                 if (options.flashonly)
                 {
                     td.addClass('flashonly');
@@ -340,13 +347,7 @@ var EDITOR = (function ($, parent) {
             //output_string += '<td class="wizardvalue">' + displayDataType(value, options, name, key) + '</td>';
             //output_string += '</tr>';
             $(id).append(tr);
-            if (options.deprecated) {
-                $("#deprbtn_"+ name).on("click", function () {
-                    var this_name = name;
-                    removeDeprecatedProperty(this_name);
-                });
-            }
-            else if (options.optional == 'true') {
+            if (options.optional == 'true') {
                 $("#optbtn_"+ name).on("click", function () {
                     var this_name = name;
                     removeOptionalProperty(this_name);