Changeset 6197 for SRUAggregator

Timestamp:

05/12/15 09:25:36 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-48 (same): bug fix (deleting window.$)

Location:

SRUAggregator/trunk/src/main/resources/assets

Files:

• clarinservices/clarinservices.js (modified) (1 diff)
• js/main.js (modified) (3 diffs)
• js/main.jsx (modified) (2 diffs)

SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.js

@@ -131 +131 @@
  ******************************************************************************/
 
-if (typeof $ != 'undefined') {
-        var old$ = $;
+if (typeof window.$ != 'undefined') {
+        var old$ = window.$;
 }
 

SRUAggregator/trunk/src/main/resources/assets/js/main.js

@@ -45 +45 @@
                         navbarCollapse: false,
                         navbarPageFn: this.renderAggregator,
-                        // navbarPageFn: this.renderStatistics,
                         errorMessages: [],
                 };
@@ -112 +111 @@
 
         renderEmbedded: function() {
-                return React.createElement(AggregatorPage, {ajax: this.ajax, embedded: true});
+                return React.createElement(AggregatorPage, {ajax: this.ajax, error: this.error, embedded: true});
         },
 
@@ -132 +131 @@
                         }
                         this.setState({navbarPageFn: pageFn});
-                        // console.log("new page: " + document.location + ", name: " + pageFnName);
+                        console.log("new page: " + document.location + ", name: " + pageFnName);
                 }
         },

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -45 +45 @@
                         navbarCollapse: false,
                         navbarPageFn: this.renderAggregator,
-                        // navbarPageFn: this.renderStatistics,
                         errorMessages: [],
                 };
@@ -112 +111 @@
 
         renderEmbedded: function() {
-                return <AggregatorPage ajax={this.ajax} embedded={true}/>;
+                return <AggregatorPage ajax={this.ajax} error={this.error} embedded={true}/>;
         },