projects / scm / bb / tizen-distro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c87724)
bitbake: toaster: Move long content toggle to main.js
authorBelen Barros Pena <belen.barros.pena@intel.com>
Wed, 19 Feb 2014 21:08:15 +0000 (21:08 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Mar 2014 19:24:01 +0000 (12:24 -0700)
I have move all javascript needed for toggling very long
values for bitbake variables to main.js. I have changed the
names of the classes involved to make them more generic,
since I hope we'll be able to reuse them in other parts
of the Toaster interface.

.full-variable is now .full
.full-variable-hide is now full-hide
.full-variable-show is now full-show

I have also removed all the inline scripting in base.html, since
it is no longer needed.

(Bitbake rev: 73828f047385ced160c7900cad24535aa8d325cd)

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/toaster/toastergui/static/js/main.js patch | blob | history
bitbake/lib/toaster/toastergui/templates/base.html patch | blob | history
bitbake/lib/toaster/toastergui/templates/configvars.html patch | blob | history

diff --git a/bitbake/lib/toaster/toastergui/static/js/main.js b/bitbake/lib/toaster/toastergui/static/js/main.js
index ce4f578..c80f716 100644 (file)
--- a/bitbake/lib/toaster/toastergui/static/js/main.js
+++ b/bitbake/lib/toaster/toastergui/static/js/main.js
@@ -75,4 +75,19 @@ $(document).ready(function() {
                });
        });
 
+       // toggle for long content (variables, python stack trace, etc)
+    $('.full, .full-hide').hide();
+    $('.full-show').click(function(){
+       $('.full').slideDown(function(){
+               $('.full-hide').show();
+        });
+        $(this).hide();
+    });
+    $('.full-hide').click(function(){
+       $(this).hide();
+        $('.full').slideUp(function(){
+            $('.full-show').show();
+        });
+    });
+
 });
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 96f093f..16a1812 100644 (file)
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -49,58 +49,6 @@ function reload_params(params) {
 }
 </script>
 
-<script>
-    $(document).ready(function() {
-        //show or hide selected columns on load
-        $("input:checkbox").each(function(){
-            var selectedType = $(this).val();
-            if($(this).is(":checked")){
-                $("."+selectedType).show();
-            }
-            else{
-                $("."+selectedType).hide();
-            }
-        });
-        //edit columns functionality (show / hide table columns)
-        $("input:checkbox").change();
-            $("input:checkbox").change(function(){
-                var selectedType = $(this).val();
-                    if($(this).is(":checked")){
-                        $("."+selectedType).show();
-                    }
-                    else{
-                        $("."+selectedType).hide();
-                    }
-            });
-        //turn edit columns dropdown into a multi-select menu
-        $('.dropdown-menu input, .dropdown-menu label').click(function(e) {
-            e.stopPropagation();
-        });
-        //show help information inside modal dialogs
-        $("#filter-variables i").tooltip({ html: true, delay: {show: 500} });
-        //show applied filter tooltip
-        $('.filtered').tooltip({container:'body', placement:'bottom', delay:{hide:1500}, html:true});
-        //hide the applied filter tooltip when you click the filter button
-        $('.btn-primary').on('click', function () {
-             $('.tooltip').hide();
-        });
-
-        $('.full-variable, .full-variable-hide').hide();
-        $('.full-variable-show').click(function(){
-            $('.full-variable').slideDown(function(){
-                $('.full-variable-hide').show();
-            });
-            $(this).hide();
-        });
-        $('.full-variable-hide').click(function(){
-            $(this).hide();
-            $('.full-variable').slideUp(function(){
-                $('.full-variable-show').show();
-            });
-        });
-     });
-</script>
-
     </head>
 
 <body style="height: 100%">
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html
index cd41cca..ecd5a0f 100644 (file)
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/bitbake/lib/toaster/toastergui/templates/configvars.html
@@ -73,12 +73,12 @@
                 <h4>{{variable.variable_name}} value is:</h4>
                 <p>
                     <span>{{variable.variable_value|string_slice:':570'}}
-                        <span class="full-variable"> {{variable.variable_value|string_slice:'570:'}}
+                        <span class="full"> {{variable.variable_value|string_slice:'570:'}}
                         </span>
-                        <a class="btn btn-mini full-variable-show">...</a>
+                        <a class="btn btn-mini full-show">...</a>
                     </span>
                 </p>
-                <a class="btn btn-mini full-variable-hide">Collapse variable value<i class="icon-caret-up"></i>
+                <a class="btn btn-mini full-hide">Collapse variable value<i class="icon-caret-up"></i>
                 </a>
               {% endif %}
             {% else %}
Domain: SCM / BB;