@@ -76,21 +76,21 @@ var oc = oc || {};
7676 JSON_REQUESTS = ! ! ocConf . jsonRequests ,
7777 MESSAGES_ERRORS_HREF_MISSING = 'Href parameter missing' ,
7878 MESSAGES_ERRORS_RETRY_FAILED =
79- 'Failed to load $0 component ' + RETRY_LIMIT + ' times. Giving up' ,
80- MESSAGES_ERRORS_LOADING_COMPILED_VIEW = 'Error getting compiled view: $0 ' ,
81- MESSAGES_ERRORS_RENDERING = 'Error rendering component: $1 , error: $0 ' ,
79+ 'Failed to load % component ' + RETRY_LIMIT + ' times. Giving up' ,
80+ MESSAGES_ERRORS_LOADING_COMPILED_VIEW = 'Error getting compiled view: % ' ,
81+ MESSAGES_ERRORS_RENDERING = 'Error rendering component: % , error: ' ,
8282 MESSAGES_ERRORS_RETRIEVING =
8383 'Failed to retrieve the component. Retrying in ' +
8484 RETRY_INTERVAL / 1000 +
8585 ' seconds...' ,
8686 MESSAGES_ERRORS_VIEW_ENGINE_NOT_SUPPORTED =
87- 'Error loading component: view engine "$0 " not supported' ,
87+ 'Error loading component: view engine "% " not supported' ,
8888 MESSAGES_LOADING_COMPONENT = ocConf . loadingMessage || '' ,
89- MESSAGES_RENDERED = "Component '$0 ' correctly rendered" ,
89+ MESSAGES_RENDERED = "Component '% ' correctly rendered" ,
9090 MESSAGES_RETRIEVING =
9191 'Unrendered component found. Trying to retrieve it...' ,
92- interpolate = function ( str , value , value2 ) {
93- return str . replace ( '$0 ' , value ) . replace ( '$1' , value2 ) ;
92+ interpolate = function ( str , value ) {
93+ return str . replace ( '% ' , value ) ;
9494 } ;
9595
9696 var registeredTemplates = __REGISTERED_TEMPLATES_PLACEHOLDER__ ,
@@ -131,11 +131,10 @@ var oc = oc || {};
131131 } ;
132132
133133 var getHeaders = function ( ) {
134+ var globalHeaders = ocConf . globalHeaders ;
134135 return $ . extend (
135136 { Accept : 'application/vnd.oc.unrendered+json' } ,
136- typeof ocConf . global == 'function'
137- ? ocConf . globalHeaders ( )
138- : ocConf . globalHeaders
137+ typeof globalHeaders == 'function' ? globalHeaders ( ) : globalHeaders
139138 ) ;
140139 } ;
141140
@@ -455,8 +454,8 @@ var oc = oc || {};
455454 attr = $component . attr . bind ( $component ) ,
456455 dataRendering = attr ( dataRenderingAttribute ) ,
457456 dataRendered = attr ( dataRenderedAttribute ) ,
458- isRendering = '' + dataRendering == 'true' ,
459- isRendered = '' + dataRendered == 'true' ;
457+ isRendering = dataRendering == 'true' ,
458+ isRendered = dataRendered == 'true' ;
460459
461460 if ( ! isRendering && ! isRendered ) {
462461 logInfo ( MESSAGES_RETRIEVING ) ;
@@ -501,9 +500,7 @@ var oc = oc || {};
501500
502501 oc . ready ( function ( ) {
503502 if ( ! href ) {
504- callback (
505- interpolate ( MESSAGES_ERRORS_RENDERING , MESSAGES_ERRORS_HREF_MISSING )
506- ) ;
503+ callback ( MESSAGES_ERRORS_RENDERING + MESSAGES_ERRORS_HREF_MISSING ) ;
507504 } else {
508505 $ . ajax ( {
509506 url : addParametersToHref (
@@ -523,7 +520,7 @@ var oc = oc || {};
523520 oc . render ( template , apiResponse . data , function ( err , html ) {
524521 if ( err ) {
525522 callback (
526- interpolate ( MESSAGES_ERRORS_RENDERING , err , apiResponse . href )
523+ interpolate ( MESSAGES_ERRORS_RENDERING , apiResponse . href ) + err
527524 ) ;
528525 } else {
529526 logInfo ( interpolate ( MESSAGES_RENDERED , template . src ) ) ;
0 commit comments