summaryrefslogtreecommitdiffstats
path: root/application/palemoon
diff options
context:
space:
mode:
Diffstat (limited to 'application/palemoon')
-rw-r--r--application/palemoon/base/content/newtab/grid.js4
-rw-r--r--application/palemoon/config/version.txt2
-rw-r--r--application/palemoon/installer/package-manifest.in2
-rw-r--r--application/palemoon/installer/windows/moz.build10
4 files changed, 10 insertions, 8 deletions
diff --git a/application/palemoon/base/content/newtab/grid.js b/application/palemoon/base/content/newtab/grid.js
index a614d0396..fbeb7bd27 100644
--- a/application/palemoon/base/content/newtab/grid.js
+++ b/application/palemoon/base/content/newtab/grid.js
@@ -115,10 +115,10 @@ var gGrid = {
// (Re-)initialize all cells.
let cellElements = this.node.querySelectorAll(".newtab-cell");
// Tycho: this._cells = [new Cell(this, cell) for (cell of cellElements)];
- this.cells = [];
+ this._cells = [];
for (let cellItem of cellElements) {
- this.cells.push(new Cell(this, cellItem));
+ this._cells.push(new Cell(this, cellItem));
}
},
diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt
index b117d70fa..da03daefe 100644
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@@ -1 +1 @@
-28.0.0a1 \ No newline at end of file
+28.0.0a2 \ No newline at end of file
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index e1897aeec..e6a4d49db 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -35,11 +35,9 @@
#ifdef XP_MACOSX
; Mac bundle stuff
@APPNAME@/Contents/Info.plist
-@APPNAME@/Contents/Library/LaunchServices
@APPNAME@/Contents/PkgInfo
@RESPATH@/firefox.icns
@RESPATH@/document.icns
-@RESPATH@/@LPROJ_ROOT@.lproj/*
#endif
[@AB_CD@]
diff --git a/application/palemoon/installer/windows/moz.build b/application/palemoon/installer/windows/moz.build
index 12e7831ed..394a85ccf 100644
--- a/application/palemoon/installer/windows/moz.build
+++ b/application/palemoon/installer/windows/moz.build
@@ -4,8 +4,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-
DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
+DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']
+
+if CONFIG['MOZ_APP_DISPLAYNAME'] in ('PaleMoon', 'Palemoon'):
+ DEFINES['MOZ_APP_DISPLAYNAME'] = "Pale Moon"
+else:
+ DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
+