Merge lp:~gesha/linaro-android-frontend/remove-mandatory-tabs into lp:linaro-android-frontend

[Georgy Redkozubov]

This branch removes mandatory tabs and fallback support for HOWTOs and adds searching of HOWTOs only in current dir.

[Данило Шеган (danilo)]

In the loop over howto_paths (line 41 of the diff), I'd say a loop variable is more likely an "index" rather than "count" (count is the total count of something; perhaps we could call it a "counter", but that suggests something else as well). It's even better if it actually indicates what's it an index for, eg. "howto_index".

review: Needs Fixing

[lp:~gesha/linaro-android-frontend/remove-mandatory-tabs]

287. By Georgy Redkozubov on 2012-10-24

Fix based on review comments

[Georgy Redkozubov (gesha)]

> In the loop over howto_paths (line 41 of the diff), I'd say a loop variable is
> more likely an "index" rather than "count" (count is the total count of
> something; perhaps we could call it a "counter", but that suggests something
> else as well). It's even better if it actually indicates what's it an index
> for, eg. "howto_index".

Fixed.

[Данило Шеган (danilo)]

Thanks, looks good now.

review: Approve

=== modified file 'static/buildDetails.js'
--- static/buildDetails.js	2012-10-19 14:07:39 +0000
+++ static/buildDetails.js	2012-10-24 12:01:21 +0000
@@ -22,7 +22,6 @@
     var buildNumber = history.get('build');
     var fetchLatest = (buildNumber === undefined);
 
-    var howto_dir = "/howto/";
     var howto_paths = [
         "HOWTO_releasenotes.txt",
         "HOWTO_install.txt",
@@ -30,12 +29,6 @@
         "HOWTO_flashfirmware.txt",
         "HOWTO_rtsm.txt"]
 
-    // For these files we use the fallback pages found in static/.
-    var howto_mandatory = [
-        "HOWTO_install.txt",
-        "HOWTO_getsourceandbuild.txt",
-        "HOWTO_flashfirmware.txt"]
-
     // Mapping for howto_paths tab titles
     var howto_titles = [
         "Release Notes",
@@ -44,14 +37,6 @@
         "Firmware Update",
         "RTSM"]
 
-    // First and the last howto's don't have fallbacks, but this can change
-    // later.
-    var howto_fallbacks = [
-        '',
-        'Please read "Image Installation Wiki page":https://wiki.linaro.org/Platform/Android/ImageInstallation <br><br>For more info, check out this "page":https://wiki.linaro.org/Platform/Android',
-        'Please read these two pages: "Get Source page":https://wiki.linaro.org/Platform/Android/GetSource and "Build Source page":https://wiki.linaro.org/Platform/Android/BuildSource <br><br>For more info, check out this "page":https://wiki.linaro.org/Platform/Android',
-        'Please read "Flash Firmware Wiki page":https://wiki.linaro.org/Platform/Android/FlashFirmware <br><br>For more info, check out this "page":https://wiki.linaro.org/Platform/Android',
-        '']
 
 
 
@@ -440,33 +425,23 @@
       function handleRenderedFiles(downloadUrl) {
 
           var rendered_files = new Object();
-          var count = 0;
+          var howto_index = 0;
 
-          for (var count in howto_paths) {
+          for (var howto_index in howto_paths) {
               $.ajax({
                   url: '/api/proxy-remote-file?url=' + downloadUrl +
-                      howto_dir + howto_paths[count],
+                      howto_paths[howto_index],
                   success: function(data) {
                       if (data != 'Invalid argument') {
-                          rendered_files[howto_titles[count]] =
+                          rendered_files[howto_titles[howto_index]] =
                               convert_textile(data);
                       }
-                      count++;
+                      howto_index++;
                   },
                   async: false,
               });
           }
 
-          for (var count in howto_paths) {
-              if ($.inArray(howto_paths[count], howto_mandatory) != -1) {
-                  if (rendered_files[howto_titles[count]] == undefined) {
-                      // No file found, get fallback.
-                      rendered_files[howto_titles[count]] =
-                          convert_textile(howto_fallbacks[count]);
-                  }
-              }
-          }
-          
           refresh_tabs(rendered_files);
       }