socmap_adf 0.0.11 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.0.0
+
+### Features & Enhancements
+* Tested on 4 production applications
+* ContextMenu update
+* Image upload updated to work in IE
+
+### Bug fixes
+* ContextMenu bug fixes with callbacks
+* Alerts removed
+
 # 0.0.11
 
 ### Features & Enhancements

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 gemspec
 
 # jquery-rails is used by the dummy application
-gem "jquery-rails"
+# gem "jquery-rails"
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Arturs Braucs @ Creative Mobile
+Copyright 2012 Arturs Braucs, Edgars Kaukis @ Creative Mobile
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,3 +1,7 @@
-# SocmapAdf
+# Socmap Applications (Mapplications) Design Framework
+
+## No public documentation yet
+
+No tests in 1.0.0 version. If you want to use this GEM, please contact us: Arturs (arturs@creo.mobi) or Edgars (edgars@creo.mobi) .
 
 This project rocks and uses MIT-LICENSE.

data/lib/assets/javascripts/socmap_adf/lib/vendor/file_uploader/fileuploader.js

@@ -1168,17 +1168,19 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
     /**
      * Sends the file identified by id and additional query params to the server
      * @param {Object} params name-value string pairs
-     */    
+     */ 
     _upload: function(id, params){
+        //this._options.onUpload(id, this.getName(id), true);
+
         var file = this._files[id],
             name = this.getName(id),
             size = this.getSize(id);
-                
+
         this._loaded[id] = 0;
-                                
+
         var xhr = this._xhrs[id] = new XMLHttpRequest();
         var self = this;
-                                        
+
         xhr.upload.onprogress = function(e){
             if (e.lengthComputable){
                 self._loaded[id] = e.loaded;
@@ -1186,53 +1188,66 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
             }
         };
 
-        xhr.onreadystatechange = function(){            
+        xhr.onreadystatechange = function(){
             if (xhr.readyState == 4){
-                self._onComplete(id, xhr);                    
+                self._onComplete(id, xhr);
             }
         };
 
         // build query string
         params = params || {};
-        params['qqfile'] = name;
+        params[this._options.inputName] = name;
         var queryString = qq.obj2url(params, this._options.action);
 
-        xhr.open("POST", queryString, true);
+        var protocol = this._options.demoMode ? "GET" : "POST";
+        xhr.open(protocol, queryString, true);
         xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
         xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
-        xhr.setRequestHeader("Content-Type", "application/octet-stream");
+        xhr.setRequestHeader("Cache-Control", "no-cache");
+        if (this._options.forceMultipart) {
+            var formData = new FormData();
+            formData.append(this._options.inputName, file);
+            file = formData;
+        } else {
+            xhr.setRequestHeader("Content-Type", "application/octet-stream");
+            //NOTE: return mime type in xhr works on chrome 16.0.9 firefox 11.0a2
+            xhr.setRequestHeader("X-Mime-Type",file.type );
+        }
+        for (key in this._options.customHeaders){
+            xhr.setRequestHeader(key, this._options.customHeaders[key]);
+        };
         xhr.send(file);
     },
     _onComplete: function(id, xhr){
-        // the request was aborted/cancelled
-        if (!this._files[id]) return;
-        
-        var name = this.getName(id);
-        var size = this.getSize(id);
-        
-        this._options.onProgress(id, name, size, size);
-                
-        if (xhr.status == 200){
-            this.log("xhr - server response received");
-            this.log("responseText = " + xhr.responseText);
-                        
-            var response;
-                    
-            try {
-                response = eval("(" + xhr.responseText + ")");
-            } catch(err){
-                response = {};
-            }
-            
-            this._options.onComplete(id, name, response);
-                        
-        } else {                   
-            this._options.onComplete(id, name, {});
-        }
-                
-        this._files[id] = null;
-        this._xhrs[id] = null;    
-        this._dequeue(id);                    
+      "use strict";
+      // the request was aborted/cancelled
+      if (!this._files[id]) { return; }
+
+      var name = this.getName(id);
+      var size = this.getSize(id);
+      var response; //the parsed JSON response from the server, or the empty object if parsing failed.
+
+      this._options.onProgress(id, name, size, size);
+
+      //this.log("xhr - server response received");
+      //this.log("responseText = " + xhr.responseText);
+
+      try {
+          if (typeof JSON.parse === "function") {
+              response = JSON.parse(xhr.responseText);
+          } else {
+              response = eval("(" + xhr.responseText + ")");
+          }
+      } catch(err){
+          response = {};
+      }
+      if (xhr.status !== 200){
+          this._options.onError(id, name, "XHR returned response code " + xhr.status);
+      }
+      this._options.onComplete(id, name, response);
+
+      this._xhrs[id] = null;
+      this._dequeue(id);                 
     },
     _cancel: function(id){
         this._options.onCancel(id, this.getName(id));

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/context_menu.js.coffee

@@ -17,24 +17,29 @@ class ADF.GMap.Views.ContextMenu extends ADF.MVC.Views.Base
     newElement = @make("div", {"class": "map_context_menu", "style" : "display:none;position:absolute;z-index:10;"} )
     @setElement( newElement )
     @map.getMapElement().append($(@el))
-    google.maps.event.addDomListener @gElement, 'rightclick', @onRightClicked
+    @rightClickEvent = google.maps.event.addListener @gElement, 'rightclick', @onRightClicked    
     @map.getMapElement().bind "mouseleave", @onMapMouseout
     $("body").bind "click", @onBodyClicked
     @
     
+  unBind: () ->
+    google.maps.event.removeListener(@rightClickEvent) if @rightClickEvent
+    @map.getMapElement().unbind "mouseleave", @onMapMouseout
+    $("body").unbind "click", @onBodyClicked
+    @remove()
+    
   show: () ->
-    $(@el).css({"top" : @position.y, "left": @position.x})
+    $(@el).css({"top" : @position.y + 1, "left": @position.x + 1})
     $(@el).show()
     @eventBus.trigger "ADF.GMap.Views.ContextMenu.isShowed"
     
   hide: () =>
     $(@el).hide()
     @eventBus.trigger "ADF.GMap.Views.ContextMenu.isHidden"
-    
+
   onRightClicked: (e) =>
     @eventBus.trigger "ADF.GMap.Views.ContextMenu.hide"
     @hide()
-
     point = @overlay.getProjection().fromLatLngToContainerPixel(e.latLng)
     @position = point
     @latLng = e.latLng

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/marker_with_label.js

@@ -376,20 +376,14 @@ MarkerLabel_.prototype.setStyles = function () {
   this.setMandatoryStyles();
 };
 
-
-MarkerLabel_.prototype.hasClass = function ( className ) {
-  return this.labelDiv_.className.match(new RegExp('(\\s|^)'+className+'(\\s|$)'));
-};
-
-MarkerLabel_.prototype.addClass = function ( className ) {  
-  if (!this.hasClass(className)) this.labelDiv_.className += " "+className;
+MarkerLabel_.prototype.addClass = function ( className ) { 
+  $(this.labelDiv_).addClass( className )
+  $(this.eventDiv_).addClass( className )
 };
 
 MarkerLabel_.prototype.removeClass = function ( className ) {
-  if (this.hasClass(className)) {
-        var reg = new RegExp('(\\s|^)'+className+'(\\s|$)');
-        this.labelDiv_.className=this.labelDiv_.className.replace(reg,' ');
-    }
+  $(this.labelDiv_).removeClass( className )
+  $(this.eventDiv_).removeClass( className )
 };
 
 

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/overlay_view.js.coffee

@@ -15,11 +15,13 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
   customMarker: null
   zindex: 1
   clickable: true
+  hoverable: false
   openOnClick: true
   asLabel: false
   showAfterDrag: false
   clustering: false
   data: 1
+  idleOn: false
 
   constructor: (options) ->
     super(options)
@@ -139,7 +141,13 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
     if @marker
       @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @marker, mapModel: @map})
       @contextMenu.render()
-
+      
+  setIdleOn: () =>
+    @idleOn = true
+    
+  setIdleOff: () =>
+    @idleOn = false
+    
   # Callback methods
   onRenderCompleted: () ->
   onMarkerAdded: () ->

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/polygon.js.coffee

@@ -2,67 +2,133 @@ class ADF.GMap.Views.Polygon extends ADF.MVC.Views.Base
   
   label: false
   content: false 
+  withLabel: false
+  initialized: false
   
   initialize: () ->
     @mapView = @options.mapView
     @zone = @options.model
+    @polygon = @zone.mapObject
     @label = @options.label if @options.label?
     @content = @options.content if @options.content?
-    @onShapeClicked = @options.onShapeClicked if typeof @options.onShapeClicked == 'function'
-    @onPolygonDrawCompleted =  @options.onPolygonDrawCompleted if typeof @options.onPolygonDrawCompleted == 'function'
-    @onPolygonDrawStarted = @options.onPolygonDrawStarted if typeof @options.onPolygonDrawStarted == 'function'
-    @pathChanged = @options.pathChanged if typeof @options.pathChanged == 'function'
-    @initialized = false
-        
+    @withLabel = @options.withLabel if @options.withLabel?
+    @_initCallbacksFromOptions()
+    @eventBus.on "setUneditable", @clearSelection
+
   initZone: (allowDraw) -> 
     @initialized = true
     @map = @mapView.getMap().getGMap()
     if @zone.isNew() && allowDraw
       @startDrawing()
     else 
-      @zone.setPolygonMap( @map )
+      @setPolygonMap( @map )
+      @setPolygonHandlers()
+      @_initLabelView() if @withLabel
       @onPolygonDrawCompleted() if allowDraw
-      @setPolygonHandlers() 
-      
+
     @mapView.getMap().addOverlay(@)
-    @setLabel() if @label
     @onZoneInitialized()
-  
+      
+  _initCallbacksFromOptions: () ->
+    @onShapeClicked = @options.onShapeClicked if typeof @options.onShapeClicked == 'function'
+    @onPolygonDrawCompleted =  @options.onPolygonDrawCompleted if typeof @options.onPolygonDrawCompleted == 'function'
+    @onPolygonDrawStarted = @options.onPolygonDrawStarted if typeof @options.onPolygonDrawStarted == 'function'
+    @onPathChanged = @options.pathChanged if typeof @options.pathChanged == 'function'
+
+  _initLabelView: () ->
+    @labelView = new ADF.Map.Views.PolygonLabel
+      point: @getCenter()
+      map : @mapView.getMap()
+      model: @zone
+      label: if @label && @label.length > 0 then @label else null
+      content: @content
+      clickable: false
+      hidden: true
+      template: @zonePopupTemplate
+            
   isClustering: () ->
     false
+    
+  removeFromMap: () -> # Depricated
+    @zone.removeFromMap()
+    @labelView.remove() if @labelView
+    
+  remove: () ->
+    @polygon.getPolygon().setMap(null)
+    @labelView.remove() if @labelView
+    @contextMenu.unBind() if @contextMenu
   
+  addContextMenu: () ->
+    @contextMenu = new ADF.GMap.Views.ContextMenu({gElement: @polygon.getPolygon(), mapModel: @mapView.getMap()})
+    @contextMenu.render()
+
+# HELPERS
   setContent: ( content ) ->
+    return unless @labelView
     @content = content
     @labelView.setContent( content )
     @labelView.render()
     
-  setLabel: ( label = null) ->
-    @label = label if label
-    bounds = new google.maps.LatLngBounds()
+  setLabel: ( label) ->
+    return unless @labelView
+    @label = label
+    @labelView.setLabel @label
 
+  setLabelPosition: () ->
+    point = @getCenter()
+    @labelView.overlay.setPosition point
+  
+  getZone: ->
+    @zone
+  
+  clearSelection: => 
+    @setUnEditable( ) 
+
+  setMap: (map) ->
+    @setPolygonMap( map )
+      
+  getCenter: () ->
+    bounds = new google.maps.LatLngBounds()
     i = 0
-    while i < @zone.getPolygon().getPath().length
-      bounds.extend(@zone.getPolygon().getPath().getAt(i))
-      i++
-    point = bounds.getCenter()
- 
-    unless @labelView
-      @labelView = new ADF.Map.Views.PolygonLabel
-        point: point
-        map : @mapView.getMap()
-        model: @zone
-        hidden: true
-        label: @label
-        content: @content
-        clickable: false
-        template: @zonePopupTemplate
-    else
-      @labelView.overlay.setPosition(point)
-      @labelView.setLabel @label
+    while i < @polygon.getPolygon().getPath().length
+     bounds.extend(@polygon.getPolygon().getPath().getAt(i))
+     i++
+    bounds.getCenter()
+
+  setFirstCoordinate: (latLng) ->
+    @first_coordinate = latLng
+
+  getFirstCoordinate: ->
+    if @first_coordinate? then @first_coordinate else false 
+        
+# HANDLERS
+  setPolygonHandlers: () ->
+    google.maps.event.addListener @polygon.getPolygon(), 'click', @newShapeClickHandler if @isEditable()
+    google.maps.event.addListener @polygon.getPolygon(), 'rightclick', @newShapeClickHandler if @isEditable()
+    
+    google.maps.event.addListener @polygon.getPolygon(), 'mouseout', @onMouseOut
+    google.maps.event.addListener @polygon.getPolygon(), 'mouseover', @onMouseOver
+    google.maps.event.addListener @polygon.getPolygon(), 'mousemove', @onMouseMove
+    google.maps.event.addListener @map, 'click', @clearSelection
+    google.maps.event.addListener @polygon.getPolygon().getPath(), 'set_at', @onPathChanged
+    google.maps.event.addListener @polygon.getPolygon().getPath(), 'insert_at', @onPathChanged
+    google.maps.event.addListener @polygon.getPolygon().getPath(), 'remove_at', @onPathChanged
+    @setEditable()
+  
+  onMouseOut: (e) =>
+    @labelView.hideOverlayAfterTime() if @labelView
       
-  setColors: (fillColor, strokeColor) ->
-    @zone.setColors(fillColor, strokeColor)
-     
+  onMouseOver: (e) =>
+    @labelView.openOverlayOnHover() if @labelView && !@isEditable() && @content && @content.length > 0
+  
+  onMouseMove: (e) =>
+    @labelView.hide() if @isEditable() && @labelView && @labelView.opened
+
+  newShapeClickHandler: ( e )  =>
+    @eventBus.trigger "setUneditable"
+    @setEditable()
+    @onShapeClicked()
+
   startDrawing: =>
     return if @zone.readOnly
     @drawingManager = new google.maps.drawing.DrawingManager
@@ -73,77 +139,46 @@ class ADF.GMap.Views.Polygon extends ADF.MVC.Views.Base
 
     @onPolygonDrawStarted()
     google.maps.event.addListener @drawingManager, 'polygoncomplete', @polygonCompleteHandler
- 
-  # stopDrawing: ->
-  #   @drawingManager.setMap(null) if @drawingManager
-  
-  setFirstCoordinate: (latLng) ->
-    @first_coordinate = latLng
-    
-  getFirstCoordinate: ->
-    if @first_coordinate? then @first_coordinate else false
-    
+
   stopDrawing: ->
     @drawingManager.setDrawingMode null if @drawingManager
             
-  getZone: ->
-    @zone
-
-  setMap: (map) ->
-    @zone.setPolygonMap(map)
-  
-  # Depricated
-  removeFromMap: () ->
-    @zone.removeFromMap()
-    @labelView.remove() if @labelView
-    
-  remove: () ->
-    @zone.getPolygon().setMap(null)
-    @labelView.remove() if @labelView
-  
   polygonCompleteHandler: ( newShape ) =>
-    @zone.setPolygon( newShape )
+    @setPolygon( newShape )
     @setPolygonHandlers()
+    @stopDrawing()
+    @_initLabelView() if @withLabel
     @onPolygonDrawCompleted()
+                 
+# DELEGATE METHODS 
+  setColors: (fillColor, strokeColor) ->
+    @polygon.setColors(fillColor, strokeColor)
+
+  setPolygon: ( polygon ) ->
+    @polygon.setPolygon( polygon )
+
+  setPolygonMap: ( map ) ->
+    @polygon.setPolygonMap( map )
+
+  setEditable: ( editable ) ->
+    @polygon.setEditable( editable )
+
+  setUnEditable: ( editable ) ->
+    @polygon.setUnEditable( editable )
+
+  setClickable: ( clickable ) ->
+    @polygon.getPolygon().setOptions({clickable: clickable})
 
-  onMouseOut: (e) =>
-    @labelView.hideOverlayAfterTime() if @labelView
-      
-  onMouseOver: (e) =>
-    @labelView.openOverlayOnHover() if @labelView && !@isEditable() && @content
-  
-  onMouseMove: (e) =>
-    @labelView.hide() if @isEditable() && @labelView && @labelView.opened
-      
-  setPolygonHandlers: () ->
-    google.maps.event.addListener @zone.getPolygon(), 'click', @newShapeClickHandler if @isEditable()
-    google.maps.event.addListener @zone.getPolygon(), 'mouseout', @onMouseOut
-    google.maps.event.addListener @zone.getPolygon(), 'mouseover', @onMouseOver
-    google.maps.event.addListener @zone.getPolygon(), 'mousemove', @onMouseMove
-    google.maps.event.addListener @map, 'click', @clearSelection
-    google.maps.event.addListener @zone.getPolygon().getPath(), 'set_at', @pathChanged
-    google.maps.event.addListener @zone.getPolygon().getPath(), 'insert_at', @pathChanged
-    google.maps.event.addListener @zone.getPolygon().getPath(), 'remove_at', @pathChanged
-    @zone.setEditable()
-   
-  
   isEditable: () ->
-    @zone.getPolygon().getEditable()
-     
-  clearSelection: => 
-    @zone.setUnEditable( )
-      
-  newShapeClickHandler: ( e )  =>   
-    @zone.setEditable()
-    @onShapeClicked()
-  
-  addContextMenu: () ->
-    @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @zone.getPolygon(), mapModel: @mapView.getMap()})
-    @contextMenu.render()
+    @polygon.getPolygon().getEditable()
+    
+  setIdleOn: () =>
+    
+  setIdleOff: () =>
                    
-  # Callback Methods
+# CALLBACKS
   onPolygonDrawCompleted: =>   
   onPolygonDrawStarted: =>
   onShapeClicked: =>
-  pathChanged: =>
+  onPathChanged: =>
   onZoneInitialized: =>

data/lib/assets/javascripts/socmap_adf/modules/image_uploader/views/main.js.coffee

@@ -23,7 +23,7 @@ class ADF.ImageUploader.Views.Main extends ADF.MVC.Views.Base
       onProgress: @onProgress
       template: @template()
       sizeLimit: 2024000
-      messages:
+      messages_lv:
         typeError: "Failam {file} ir nepareizs formāts. Tikai {extensions} formāti ir atļauti."
         sizeError: "Fails {file} ir pārāk liels. Faila maksimālais lielums {sizeLimit}."
         minSizeError: "Faila {file} izmērs ir par mazu, minimums {minSizeLimit}."

data/lib/assets/javascripts/socmap_adf/modules/overlay/views/flash_overlay.coffee

@@ -1,7 +1,6 @@
 class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
   
   opened: false
-  clickable: false
   hoverable: true
   calibration: [0, -16, -20, 0]
   mouseout: true
@@ -10,8 +9,8 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
   constructor: (options) ->
     super(options)
     @pushOverlay()
-    @eventBus.on "ADF.GMap.Views.ContextMenu.isShowed", @setUnHoverable
-    @eventBus.on "ADF.GMap.Views.ContextMenu.isHidden", @setHoverable
+    @eventBus.on "ADF.GMap.Views.ContextMenu.isShowed", @hideAndSetIdleOn
+    @eventBus.on "ADF.GMap.Views.ContextMenu.isHidden", @setIdleOff
     
   onMarkerMouseOver: () =>
     @openOverlayOnHover()
@@ -20,10 +19,11 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     @hideOverlayAfterTime() if @mouseout
 
   openOverlayOnHover: () =>
-    @map.hideAllOverlays()
-    @opened = true
-    @calculatePosition()
-    @show()
+    if !@idleOn
+      @map.hideAllOverlays()
+      @opened = true
+      @calculatePosition()
+      @show()
     
   hideOverlayIfNeeded: () =>
     @hide() if !@opened
@@ -47,6 +47,10 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     @hoverable = false
     @hide()
     
+  hideAndSetIdleOn: () =>
+    @hide()
+    @setIdleOn()
+    
   setHoverable: () =>
     @hoverable = true
     

data/lib/assets/javascripts/socmap_adf/modules/overlay/views/polygon_label.js.coffee

@@ -5,13 +5,15 @@ class ADF.Map.Views.PolygonLabel extends ADF.Overlay.Views.FlashOverlay
   mouseout: false
   hoverable: false
   
+  
   initialize: () ->
     super()
     @label = @options.label
     @content = @options.content
     @template = @options.template if @options.template
     @customMarker = new ADF.Zone.Views.LabelMarker()
-    
+    @labelClass = "marker_label hover" if @content 
+     
   setContent: (content) ->
     @content = content
   
@@ -26,7 +28,11 @@ class ADF.Map.Views.PolygonLabel extends ADF.Overlay.Views.FlashOverlay
   onRenderCompleted: () ->
     @$(".content").html(@content)
     $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
-    
+    if @content && @marker.label?
+      @marker.set("labelClass", "marker_label hover")
+    else if @marker.label
+      @marker.set("labelClass", "marker_label")
+      
   onOverlayShowed: () =>
     @_setScrollable()
 

data/lib/socmap_adf/version.rb

@@ -1,3 +1,3 @@
 module SocmapAdf
-  VERSION = "0.0.11"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 57803292243622167
+      hash: -1446995154133423231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 57803292243622167
+      hash: -1446995154133423231
 requirements: []
 rubyforge_project: socmap_adf
 rubygems_version: 1.8.24