From 32671495638459b6c330c9e46bcd5541349bedf6 Mon Sep 17 00:00:00 2001 From: Lennard Voogdt Date: Sat, 26 Oct 2013 13:56:17 +0200 Subject: [PATCH] JSHint --- codekit-config.json | 363 ++++++++++++++++++++++++++++ dist/leaflet.awesome-markers.js | 155 ++++++------ dist/leaflet.awesome-markers.min.js | 3 +- examples/basic-example.html | 2 +- examples/random-markers.html | 18 +- examples/with-bootstrap.html | 19 +- 6 files changed, 466 insertions(+), 94 deletions(-) create mode 100644 codekit-config.json diff --git a/codekit-config.json b/codekit-config.json new file mode 100644 index 0000000000..076b6f5514 --- /dev/null +++ b/codekit-config.json @@ -0,0 +1,363 @@ +{ + "CodeKitInfo" : "This is a CodeKit project configuration file. It is designed to sync project settings across multiple machines. Modifying the contents of this file can be a poor life decision if you don't know what you're doing. This file is not useful unless accompanied by the project that created it in CodeKit. For more information, see: http:\/\/incident57.com\/codekit", + "creatorBuild" : "8376", + "files" : { + "\/examples\/css\/font-awesome-ie7.min.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/css\/font-awesome-ie7.min.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + }, + "\/dist\/images\/markers-shadow.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-shadow.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-shadow.png", + "initialSize" : 535, + "fileType" : 8192 + }, + "\/examples\/basic-example.html" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/basic-example.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, + "\/dist\/leaflet.awesome-markers.min.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 1, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/leaflet.awesome-markers.min.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 1, + "outputAbbreviatedPath" : "\/dist\/leaflet.awesome-markers.min.min.js", + "fileType" : 64 + }, + "\/examples\/css\/font-awesome.min.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/css\/font-awesome.min.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + }, + "\/screenshots\/screenshot-soft.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/screenshots\/screenshot-soft.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/screenshots\/screenshot-soft.png", + "initialSize" : 218197, + "fileType" : 8192 + }, + "\/dist\/images\/markers-soft@2x.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-soft@2x.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-soft@2x.png", + "initialSize" : 23106, + "fileType" : 8192 + }, + "\/dist\/images\/markers-matte@2x.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-matte@2x.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-matte@2x.png", + "initialSize" : 31113, + "fileType" : 8192 + }, + "\/dist\/leaflet.awesome-markers.js" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/leaflet.awesome-markers.js", + "outputStyle" : 1, + "syntaxCheckerStyle" : 1, + "outputAbbreviatedPath" : "\/dist\/leaflet.awesome-markers.min.js", + "fileType" : 64 + }, + "\/examples\/with-bootstrap.html" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/with-bootstrap.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, + "\/dist\/images\/markers-soft.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-soft.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-soft.png", + "initialSize" : 10487, + "fileType" : 8192 + }, + "\/dist\/images\/markers-plain.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-plain.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-plain.png", + "initialSize" : 7946, + "fileType" : 8192 + }, + "\/dist\/images\/markers-matte.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-matte.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-matte.png", + "initialSize" : 14323, + "fileType" : 8192 + }, + "\/examples\/random-markers.html" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/examples\/random-markers.html", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, + "\/screenshots\/screenshot-matte.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/screenshots\/screenshot-matte.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/screenshots\/screenshot-matte.png", + "initialSize" : 197696, + "fileType" : 8192 + }, + "\/dist\/images\/markers-shadow@2x.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/images\/markers-shadow@2x.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/dist\/images\/markers-shadow@2x.png", + "initialSize" : 1469, + "fileType" : 8192 + }, + "\/dist\/leaflet.awesome-markers.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/dist\/leaflet.awesome-markers.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + } + }, + "manualImportLinks" : [ + + ], + "projectSettings" : { + "hamlNoEscapeInAttributes" : 0, + "kitAutoOutputPathStyle" : 0, + "lessOutputStyle" : 0, + "hamlAutoOutputPathReplace2" : "", + "draggedImportConcatenationStyle" : 1, + "jadeAutoOutputPathStyle" : 0, + "hamlEscapeHTMLCharacters" : 0, + "javascriptAutoOutputPathStyle" : 0, + "hamlOutputFormat" : 2, + "stylusAutoOutputPathReplace1" : "stylus", + "lessStrictImports" : 0, + "sassAutoOutputPathStyle" : 2, + "stylusAutoOutputPathReplace2" : "css", + "lessAutoOutputPathStyle" : 2, + "lessIECompatibility" : 1, + "genericWebpageFileExtensionsString" : "html, htm, shtml, shtm, xhtml, php, jsp, asp, aspx, erb, ctp", + "lessStrictUnits" : 0, + "lessStrictMath" : 0, + "coffeeMinifyOutput" : 1, + "javascriptOutputSuffix" : ".min", + "jadeOutputStyle" : 0, + "coffeeAutoOutputPathStyle" : 0, + "autoSyncProjectSettingsFile" : 1, + "lessAutoOutputPathReplace1" : "less", + "jadeAutoOutputPathReplace1" : "", + "lessAutoOutputPathRelativePath" : "..\/css", + "hamlAutoOutputPathRelativePath" : "", + "jsCheckerReservedNamesString" : "", + "javascriptOutputStyle" : 1, + "stylusDebugStyle" : 0, + "hamlUseCDATA" : 0, + "hamlAutoOutputPathStyle" : 0, + "sassDebugStyle" : 0, + "hamlOutputStyle" : 0, + "stylusAutoOutputPathRelativePath" : "..\/css", + "jsCheckerIndent" : 4, + "kitAutoOutputPathRelativePath" : "", + "lessAutoOutputPathReplace2" : "css", + "jadeAutoOutputPathReplace2" : "", + "shouldRunBless" : 0, + "stylusAutoOutputPathStyle" : 2, + "coffeeCheckOutputStyle" : 0, + "slimOutputStyle" : 1, + "javascriptSyntaxCheckerStyle" : 1, + "sassAutoOutputPathReplace1" : "sass", + "slimAutoOutputPathReplace1" : "", + "sassOutputStyle" : 0, + "coffeeAutoOutputPathRelativePath" : "", + "slimCompileOnly" : 0, + "slimLogicless" : 0, + "uglifyIndent" : 4, + "jadeAutoOutputPathRelativePath" : "", + "hamlUseUnixNewlines" : 0, + "hamlAutoOutputPathReplace1" : "", + "javascriptAutoOutputPathReplace1" : "", + "stylusOutputStyle" : 0, + "javascriptAutoOutputPathReplace2" : "", + "sassAutoOutputPathRelativePath" : "..\/css", + "coffeeAutoOutputPathReplace1" : "", + "hamlUseDoubleQuotes" : 0, + "coffeeAutoOutputPathReplace2" : "", + "kitAutoOutputPathReplace1" : "", + "uglifyReservedNamesString" : "", + "coffeeOutputStyle" : 0, + "slimAutoOutputPathRelativePath" : "", + "jsHintFlags" : { + "latedef" : 1, + "newcap" : 1, + "curly" : 1, + "trailing" : 1, + "nonew" : 1, + "es3" : 0, + "freeze" : 1, + "yui" : 0, + "mootools" : 0, + "proto" : 0, + "boss" : 0, + "funcscope" : 0, + "jquery" : 1, + "esnext" : 0, + "camelcase" : 0, + "dojo" : 0, + "strict" : 0, + "devel" : 0, + "wsh" : 0, + "nonstandard" : 0, + "asi" : 0, + "moz" : 0, + "rhino" : 0, + "smarttabs" : 0, + "lastsemic" : 0, + "noempty" : 0, + "eqnull" : 0, + "eqeqeq" : 1, + "couch" : 0, + "evil" : 0, + "expr" : 0, + "immed" : 0, + "globalstrict" : 0, + "undef" : 1, + "iterator" : 0, + "prototypejs" : 0, + "noarg" : 1, + "supernew" : 0, + "node" : 0, + "unused" : 1, + "debug" : 0, + "bitwise" : 1, + "notypeof" : 1, + "white" : 0, + "browser" : 1, + "worker" : 0, + "laxcomma" : 0, + "multistr" : 0, + "shadow" : 0, + "sub" : 0, + "plusplus" : 0, + "scripturl" : 0, + "forin" : 0, + "loopfunc" : 0, + "laxbreak" : 0 + }, + "jsLintFlags" : { + "white" : 0, + "unparam" : 0, + "regexp" : 0, + "nomen" : 0, + "vars" : 0, + "sub" : 0, + "stupid" : 0, + "continue" : 0, + "bitwise" : 0, + "newcap" : 0, + "sloppy" : 0, + "closure" : 0, + "browser" : 1, + "properties" : 0, + "plusplus" : 0, + "debug" : 0, + "forin" : 0, + "eqeq" : 0, + "evil" : 0, + "node" : 0, + "rhino" : 0, + "devel" : 0, + "ass" : 0 + }, + "uglifyFlags" : { + "no-mangle-functions" : 0, + "no-mangle" : 0, + "no-copyright" : 0, + "no-dead-code" : 0, + "inline-script" : 0, + "ascii" : 0, + "unsafe" : 0, + "mangle-toplevel" : 0, + "no-seqs" : 1, + "beautify" : 0, + "lift-vars" : 0, + "consolidate-primitive-values" : 0, + "no-squeeze" : 0 + }, + "sassAutoOutputPathReplace2" : "css", + "slimAutoOutputPathReplace2" : "", + "jadeCompileDebug" : 1, + "slimRailsCompatible" : 0, + "kitAutoOutputPathReplace2" : "", + "lessRelativeURLS" : 0, + "lessDebugStyle" : 0, + "javascriptAutoOutputPathRelativePath" : "", + "slimAutoOutputPathStyle" : 0 + }, + "projectAttributes" : { + "bourbonEnabled" : 0, + "displayValue" : "repository", + "displayValueWasSetByUser" : 0, + "compassEnabled" : 0 + } +} \ No newline at end of file diff --git a/dist/leaflet.awesome-markers.js b/dist/leaflet.awesome-markers.js index 4cdb526597..3c1efd5f31 100644 --- a/dist/leaflet.awesome-markers.js +++ b/dist/leaflet.awesome-markers.js @@ -5,101 +5,102 @@ http://leafletjs.com https://github.com/lvoogdt */ + +/*global L*/ + (function (window, document, undefined) { -/* - * Leaflet.AwesomeMarkers assumes that you have already included the Leaflet library. - */ + "use strict"; + /* + * Leaflet.AwesomeMarkers assumes that you have already included the Leaflet library. + */ -L.AwesomeMarkers = {}; + L.AwesomeMarkers = {}; -L.AwesomeMarkers.version = '1.0'; + L.AwesomeMarkers.version = '1.0'; -L.AwesomeMarkers.Icon = L.Icon.extend({ - options: { - iconSize: [35, 45], - iconAnchor: [17, 42], - popupAnchor: [1, -32], - shadowAnchor: [10, 12], - shadowSize: [36, 16], - className: 'awesome-marker', - icon: 'home', - color: 'blue', - iconColor: 'white' - }, + L.AwesomeMarkers.Icon = L.Icon.extend({ + options: { + iconSize: [35, 45], + iconAnchor: [17, 42], + popupAnchor: [1, -32], + shadowAnchor: [10, 12], + shadowSize: [36, 16], + className: 'awesome-marker', + icon: 'home', + color: 'blue', + iconColor: 'white' + }, - initialize: function (options) { - options = L.setOptions(this, options); - }, + initialize: function (options) { + options = L.setOptions(this, options); + }, - createIcon: function () { - var div = document.createElement('div'), - options = this.options; + createIcon: function () { + var div = document.createElement('div'), + options = this.options; - if (options.icon) { - div.innerHTML = this._createInner(); - } + if (options.icon) { + div.innerHTML = this._createInner(); + } - if (options.bgPos) { - div.style.backgroundPosition = - (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px'; - } + if (options.bgPos) { + div.style.backgroundPosition = + (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px'; + } - this._setIconStyles(div, 'icon-' + options.color); - return div; - }, + this._setIconStyles(div, 'icon-' + options.color); + return div; + }, - _createInner: function() { - var iconClass; - if(this.options.icon.slice(0,5)==="icon-"){ - iconClass=this.options.icon; - }else{ - iconClass="icon-"+this.options.icon; - } - return ""; - }, + _createInner: function() { + var iconClass; + // if(this.options.icon.slice(0,5)==="icon-"){ + iconClass=this.options.icon; + // }else{ + // iconClass="icon-"+this.options.icon; + // } + return ""; + }, - _setIconStyles: function (img, name) { - var options = this.options, - size = L.point(options[name == 'shadow' ? 'shadowSize' : 'iconSize']), - anchor; + _setIconStyles: function (img, name) { + var options = this.options, + size = L.point(options[name === 'shadow' ? 'shadowSize' : 'iconSize']), + anchor; - if (name === 'shadow') { - anchor = L.point(options.shadowAnchor || options.iconAnchor); - } else { - anchor = L.point(options.iconAnchor); - } + if (name === 'shadow') { + anchor = L.point(options.shadowAnchor || options.iconAnchor); + } else { + anchor = L.point(options.iconAnchor); + } - if (!anchor && size) { - anchor = size.divideBy(2, true); - } + if (!anchor && size) { + anchor = size.divideBy(2, true); + } - img.className = 'awesome-marker-' + name + ' ' + options.className; + img.className = 'awesome-marker-' + name + ' ' + options.className; - if (anchor) { - img.style.marginLeft = (-anchor.x) + 'px'; - img.style.marginTop = (-anchor.y) + 'px'; - } + if (anchor) { + img.style.marginLeft = (-anchor.x) + 'px'; + img.style.marginTop = (-anchor.y) + 'px'; + } - if (size) { - img.style.width = size.x + 'px'; - img.style.height = size.y + 'px'; - } - }, + if (size) { + img.style.width = size.x + 'px'; + img.style.height = size.y + 'px'; + } + }, - createShadow: function () { - var div = document.createElement('div'), - options = this.options; + createShadow: function () { + var div = document.createElement('div'); - this._setIconStyles(div, 'shadow'); - return div; - } -}); - -L.AwesomeMarkers.icon = function (options) { - return new L.AwesomeMarkers.Icon(options); -}; + this._setIconStyles(div, 'shadow'); + return div; + } + }); + + L.AwesomeMarkers.icon = function (options) { + return new L.AwesomeMarkers.Icon(options); + }; }(this, document)); diff --git a/dist/leaflet.awesome-markers.min.js b/dist/leaflet.awesome-markers.min.js index 5197d15a86..129f4121e5 100644 --- a/dist/leaflet.awesome-markers.min.js +++ b/dist/leaflet.awesome-markers.min.js @@ -4,5 +4,4 @@ http://leafletjs.com https://github.com/lvoogdt -*/ -(function(e,t,n){L.AwesomeMarkers={};L.AwesomeMarkers.version="1.0";L.AwesomeMarkers.Icon=L.Icon.extend({options:{iconSize:[35,45],iconAnchor:[17,42],popupAnchor:[1,-32],shadowAnchor:[10,12],shadowSize:[36,16],className:"awesome-marker",icon:"home",color:"blue",iconColor:"white"},initialize:function(e){e=L.setOptions(this,e)},createIcon:function(){var e=t.createElement("div"),n=this.options;if(n.icon){e.innerHTML=this._createInner()}if(n.bgPos){e.style.backgroundPosition=-n.bgPos.x+"px "+ -n.bgPos.y+"px"}this._setIconStyles(e,"icon-"+n.color);return e},_createInner:function(){var e;if(this.options.icon.slice(0,5)==="icon-"){e=this.options.icon}else{e="icon-"+this.options.icon}return""},_setIconStyles:function(e,t){var n=this.options,r=L.point(n[t=="shadow"?"shadowSize":"iconSize"]),i;if(t==="shadow"){i=L.point(n.shadowAnchor||n.iconAnchor)}else{i=L.point(n.iconAnchor)}if(!i&&r){i=r.divideBy(2,true)}e.className="awesome-marker-"+t+" "+n.className;if(i){e.style.marginLeft=-i.x+"px";e.style.marginTop=-i.y+"px"}if(r){e.style.width=r.x+"px";e.style.height=r.y+"px"}},createShadow:function(){var e=t.createElement("div"),n=this.options;this._setIconStyles(e,"shadow");return e}});L.AwesomeMarkers.icon=function(e){return new L.AwesomeMarkers.Icon(e)}})(this,document); +*//*global L*/(function(e,t,n){"use strict";L.AwesomeMarkers={};L.AwesomeMarkers.version="1.0";L.AwesomeMarkers.Icon=L.Icon.extend({options:{iconSize:[35,45],iconAnchor:[17,42],popupAnchor:[1,-32],shadowAnchor:[10,12],shadowSize:[36,16],className:"awesome-marker",icon:"home",color:"blue",iconColor:"white"},initialize:function(e){e=L.setOptions(this,e)},createIcon:function(){var e=t.createElement("div"),n=this.options;n.icon&&(e.innerHTML=this._createInner());n.bgPos&&(e.style.backgroundPosition=-n.bgPos.x+"px "+ -n.bgPos.y+"px");this._setIconStyles(e,"icon-"+n.color);return e},_createInner:function(){var e;e=this.options.icon;return""},_setIconStyles:function(e,t){var n=this.options,r=L.point(n[t==="shadow"?"shadowSize":"iconSize"]),i;t==="shadow"?i=L.point(n.shadowAnchor||n.iconAnchor):i=L.point(n.iconAnchor);!i&&r&&(i=r.divideBy(2,!0));e.className="awesome-marker-"+t+" "+n.className;if(i){e.style.marginLeft=-i.x+"px";e.style.marginTop=-i.y+"px"}if(r){e.style.width=r.x+"px";e.style.height=r.y+"px"}},createShadow:function(){var e=t.createElement("div");this._setIconStyles(e,"shadow");return e}});L.AwesomeMarkers.icon=function(e){return new L.AwesomeMarkers.Icon(e)}})(this,document); \ No newline at end of file diff --git a/examples/basic-example.html b/examples/basic-example.html index ca3f512c7d..163e0d1249 100644 --- a/examples/basic-example.html +++ b/examples/basic-example.html @@ -1,7 +1,7 @@ - Leaflet Quick Start Guide Example + Awesome Markers Example: Basic diff --git a/examples/random-markers.html b/examples/random-markers.html index 4715834a3c..9bacbb1792 100644 --- a/examples/random-markers.html +++ b/examples/random-markers.html @@ -1,18 +1,22 @@ - Leaflet Quick Start Guide Example + Awesome Markers Example: Random Markers - + + - - + + + + + +
diff --git a/examples/with-bootstrap.html b/examples/with-bootstrap.html index 616f5aefec..794d6c1521 100644 --- a/examples/with-bootstrap.html +++ b/examples/with-bootstrap.html @@ -1,18 +1,23 @@ - Leaflet Quick Start Guide Example + Awesome Markers Example: With Bootstrap - - + + + - - + + + + + +