← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to browser/components/migration/content/migration.js

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser/components/migration/content/migration.js
87
87
  // 1 - Import Source
88
88
  onImportSourcePageShow: function ()
89
89
  {
 
90
    // Reference to the "From File" radio button 
 
91
    var fromfile = null;
 
92
 
90
93
    //XXXquark This function is called before init, so check for bookmarks here
91
94
    if ("arguments" in window && window.arguments[0] == "bookmarks") {
92
95
      this._bookmarks = true;
93
96
 
94
 
      var fromfile = document.getElementById("fromfile");
 
97
      fromfile = document.getElementById("fromfile");
95
98
      fromfile.hidden = false;
96
99
 
97
100
      var importBookmarks = document.getElementById("importBookmarks");
103
106
 
104
107
    this._wiz.canRewind = false;
105
108
 
106
 
    // The migrator to select
107
 
    var selectedMigrator = null;
 
109
    // The migrator to select. If the "fromfile" migrator is available, use it
 
110
    // as the default in case we have no other migrators.
 
111
    var selectedMigrator = fromfile;
108
112
 
109
113
    // Figure out what source apps are are available to import from:
110
114
    var group = document.getElementById("importSourceGroup");