File tree Expand file tree Collapse file tree 3 files changed +15
-15
lines changed Expand file tree Collapse file tree 3 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 101
101
return ;
102
102
}
103
103
104
- keyValPair = line . split ( / = ( . + ) ? / ) ;
105
- if ( keyValPair && keyValPair . length === 3 ) {
106
- if ( keyValPair [ 1 ] ) {
104
+ keyValPair = line . match ( / ( [ ^ = ] * ) = ( . * ) $ / ) ;
105
+ if ( keyValPair && keyValPair [ 1 ] ) {
106
+ if ( keyValPair [ 2 ] ) {
107
107
// second value in keyValPair can be undefined
108
108
// when value in the file is empty
109
109
// eg: key =
110
- value = keyValPair [ 1 ] . trim ( ) ;
110
+ value = keyValPair [ 2 ] . trim ( ) ;
111
111
}
112
- curModuleMap [ keyValPair [ 0 ] . trim ( ) ] = value ;
112
+ curModuleMap [ keyValPair [ 1 ] . trim ( ) ] = value ;
113
113
} else {
114
114
log ( 'Invalid line : ' + line ) ;
115
115
}
178
178
*/
179
179
function log ( msg , doAlert ) {
180
180
// log message to console if debug mode enabled.
181
- if ( debugMode && console && console . log ) {
182
- console . log ( 'messageResource.js : ' + msg ) ;
181
+ if ( debugMode && global . console && global . console . log ) {
182
+ global . console . log ( 'messageResource.js : ' + msg ) ;
183
183
}
184
184
// alert messages if needed
185
185
if ( doAlert === true ) {
Original file line number Diff line number Diff line change 101
101
return ;
102
102
}
103
103
104
- keyValPair = line . split ( / = ( . + ) ? / ) ;
105
- if ( keyValPair && keyValPair . length === 3 ) {
106
- if ( keyValPair [ 1 ] ) {
104
+ keyValPair = line . match ( / ( [ ^ = ] * ) = ( . * ) $ / ) ;
105
+ if ( keyValPair && keyValPair [ 1 ] ) {
106
+ if ( keyValPair [ 2 ] ) {
107
107
// second value in keyValPair can be undefined
108
108
// when value in the file is empty
109
109
// eg: key =
110
- value = keyValPair [ 1 ] . trim ( ) ;
110
+ value = keyValPair [ 2 ] . trim ( ) ;
111
111
}
112
- curModuleMap [ keyValPair [ 0 ] . trim ( ) ] = value ;
112
+ curModuleMap [ keyValPair [ 1 ] . trim ( ) ] = value ;
113
113
} else {
114
114
log ( 'Invalid line : ' + line ) ;
115
115
}
178
178
*/
179
179
function log ( msg , doAlert ) {
180
180
// log message to console if debug mode enabled.
181
- if ( debugMode && console && console . log ) {
182
- console . log ( 'messageResource.js : ' + msg ) ;
181
+ if ( debugMode && global . console && global . console . log ) {
182
+ global . console . log ( 'messageResource.js : ' + msg ) ;
183
183
}
184
184
// alert messages if needed
185
185
if ( doAlert === true ) {
You can’t perform that action at this time.
0 commit comments