Changeset 8602 for mauRepo

Timestamp:

03/10/12 14:14:01 (7 years ago)

Author:

mnagni

Message:

trying to fix the chrome openLayer issue. Refactoring and cleaning some old code

Location:

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static

Files:

• js/cedaObservation.js (modified) (3 diffs)
• js/cedaol.js (modified) (2 diffs)
• templates/base.html (modified) (1 diff)
• templates/cedaObservation.html (modified) (1 diff)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaObservation.js

@@ -301 +301 @@
                         var old_json = dojo.byId('old_coObs_id').value;
                         var json = dojo.byId('coObs_id').value;
-                        var isChrome = /(chrome)[ \/]([\w.]+)/i.test(navigator.userAgent);
                         
                         if (json == ''){                                        
@@ -375 +374 @@
                                 }
                                 catch(err){
-                                        console.log('no point of contact given')
+                                        if (isChrome) {
+                                                console.log('no point of contact given')        
+                                        }                                       
                                 }
                         
@@ -404 +405 @@
                                 }
                                 catch(err){
-                                        console.log('map plotting issue')
+                                        if (isChrome) {
+                                                console.log('map plotting issue')       
+                                        }                                       
                                 }
                                  

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaol.js

@@ -12 +12 @@
    return {  
         drawMap: function(extents, map_id,ids){
-                
-                map = new OpenLayers.Map(map_id);               
+                var map = new OpenLayers.Map(map_id);           
                         if (ids['ceda_title'].code != 'Data from Mars Analysis Correction Data Assimilation (MACDA)'){
                                 var layer = new OpenLayers.Layer.WMS('OpenLayers WMS', 
@@ -40 +39 @@
                 style: layer_style,
                 renderers: renderer})
-          
                 var boxes  = new OpenLayers.Layer.Vector( "Boxes" );            
                         for (var i = 0; i < extents.length; i++) {

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/base.html

@@ -44 +44 @@
                 ]
         };
-                if (navigator.userAgent.toLowerCase().indexOf('chrome') > -1){console.log(dojoConfig)}
+                var isChrome = /(chrome)[ \/]([\w.]+)/i.test(navigator.userAgent);
+                if (isChrome){
+                        console.log(dojoConfig)
+                };
     </script>
     <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.8/dojo/dojo.js">   </script>               

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/cedaObservation.html

@@ -77 +77 @@
         </div>
     <div id="lower_tab1" style="height:300px" class="grid_8 push_2 cedaObs">
-                
-                <script type="text/javascript">
-                        /* require necessary classes */
-                        dojo.require('dijit.layout.TabContainer');
-                        dojo.require('dijit.layout.ContentPane');
-                        dojo.require('dijit.form.Button');
-                        
-                        /* when all classes have loaded... */
-                        dojo.ready(function() {
-                                /* 
-                                        don't need to do anything programmatically!
-                                        parseOnLoad and dojoType does the magic!
-                                */
-                        });
-                </script>
 
         <!-- will host all tabs and their content panes -->