Really fix #95

messageformat · Apr 2, 2015 · 6d8d2ef · 6d8d2ef
1 parent 5a59717
commit 6d8d2ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/messageformat.dev.js b/lib/messageformat.dev.js
@@ -206,7 +206,7 @@
      * @returns {string} The result of the pluralization
      */
     plural: function(value, offset, lcfunc, data, isOrdinal) {
-      if (data.hasOwnProperty(value)) return data[value]();
+      if ({}.hasOwnProperty.call(data, value)) return data[value]();
       if (offset) value -= offset;
       var key = lcfunc(value, isOrdinal);
       if (key in data) return data[key]();
@@ -221,7 +221,7 @@
      * @returns {string} The result of the select statement
      */
     select: function(value, data) {
-      if (data.hasOwnProperty(value)) return data[value]();
+      if ({}.hasOwnProperty.call(data, value)) return data[value]();
       return data.other()
     },
 

diff --git a/messageformat.js b/messageformat.js
@@ -206,7 +206,7 @@
      * @returns {string} The result of the pluralization
      */
     plural: function(value, offset, lcfunc, data, isOrdinal) {
-      if (data.hasOwnProperty(value)) return data[value]();
+      if ({}.hasOwnProperty.call(data, value)) return data[value]();
       if (offset) value -= offset;
       var key = lcfunc(value, isOrdinal);
       if (key in data) return data[key]();
@@ -221,7 +221,7 @@
      * @returns {string} The result of the select statement
      */
     select: function(value, data) {
-      if (data.hasOwnProperty(value)) return data[value]();
+      if ({}.hasOwnProperty.call(data, value)) return data[value]();
       return data.other()
     },
 

diff --git a/test/tests.js b/test/tests.js
@@ -663,7 +663,7 @@ describe( "MessageFormat", function () {
 
       it("should not expose prototype members - selects", function () {
         var mf = new MessageFormat( 'en' );
-        var mfunc = mf.compile("I am {FEELING, select, a{happy} b{sad} other{indifferent}}.");
+        var mfunc = mf.compile("I am {FEELING, select, a{happy} hasOwnProperty{evil} other{indifferent}}.");
         expect(mfunc({FEELING:"toString"})).to.eql("I am indifferent.");
       });