Changeset 20828

Timestamp:

06/28/16 21:12:40 (9 years ago)

Author:

ayfeng

Message:

FIX: Invalid call to WriteData fails because prefix is included

Location:

issm/trunk-jpl

Files:

• jenkins/javascript/karma/lib/bin/mask.js (modified) (1 diff)
• jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js (modified) (1 diff)
• src/m/classes/mask.js (modified) (1 diff)

issm/trunk-jpl/jenkins/javascript/karma/lib/bin/mask.js

@@ -56 +56 @@
                         }
                 } // }}}
-                this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
+                this.marshall=function(md,fid) { //{{{
+            WriteData(fid,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+            WriteData(fid,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 }//}}}
                 this.fix=function() { //{{{

issm/trunk-jpl/jenkins/javascript/karma/scripts/specs/issm-ajax.spec.js

@@ -13 +13 @@
     it("contains test101", function(done) {
         $.ajax({
-            url: 'http://localhost:8080/test107.js',
+            url: 'http://localhost:8080/test101.js',
             dataType: 'script',
             success: onAjaxSuccess,

issm/trunk-jpl/src/m/classes/mask.js

@@ -56 +56 @@
                         }
                 } // }}}
-                this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
+                this.marshall=function(md,fid) { //{{{
+            WriteData(fid,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+            WriteData(fid,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 }//}}}
                 this.fix=function() { //{{{