').parent().attr({
+ id: modeId + '_' + id,
title: id
});
// Store for later use
- cur_lib.buttons.push(icon_btn[0]);
+ curLib.buttons.push(iconBtn[0]);
}
}
- function loadLibrary(cat_id) {
-
- var lib = library[cat_id];
+ function loadLibrary (catId) {
+ var lib = library[catId];
if (!lib) {
$('#shape_buttons').html('Loading...');
- $.getJSON(svgEditor.curConfig.extPath + 'shapelib/' + cat_id + '.json', function(result) {
- cur_lib = library[cat_id] = {
+ $.getJSON(svgEditor.curConfig.extPath + 'shapelib/' + catId + '.json', function (result) {
+ curLib = library[catId] = {
data: result.data,
size: result.size,
fill: result.fill
};
- makeButtons(cat_id, result);
+ makeButtons(catId, result);
loadIcons();
});
return;
}
- cur_lib = lib;
- if (!lib.buttons.length) {makeButtons(cat_id, lib);}
+ curLib = lib;
+ if (!lib.buttons.length) { makeButtons(catId, lib); }
loadIcons();
}
@@ -145,53 +145,52 @@ svgEditor.addExtension('shapes', function() {'use strict';
position: 6,
title: 'Shape library',
events: {
- click: function() {
- canv.setMode(mode_id);
+ click: function () {
+ canv.setMode(modeId);
}
}
}],
- callback: function() {
- $('').appendTo('head');
+ function showPanel (on) {
+ var fcRules = $('#fc_rules');
+ if (!fcRules.length) {
+ fcRules = $('').appendTo('head');
}
- fc_rules.text(!on ? '' : ' #tool_topath { display: none !important; }');
+ fcRules.text(!on ? '' : ' #tool_topath { display: none !important; }');
$('#star_panel').toggle(on);
}
@@ -39,7 +39,7 @@ svgEditor.addExtension('star', function(S){'use strict';
}
*/
- function setAttr(attr, val){
+ function setAttr (attr, val) {
svgCanvas.changeSelectedAttribute(attr, val);
S.call('changed', selElems);
}
@@ -63,7 +63,7 @@ svgEditor.addExtension('star', function(S){'use strict';
title: 'Star Tool',
position: 12,
events: {
- click: function(){
+ click: function () {
showPanel(true);
svgCanvas.setMode('star');
}
@@ -79,7 +79,7 @@ svgEditor.addExtension('star', function(S){'use strict';
size: 3,
defval: 5,
events: {
- change: function(){
+ change: function () {
setAttr('point', this.value);
}
}
@@ -100,23 +100,23 @@ svgEditor.addExtension('star', function(S){'use strict';
size: 3,
defval: 0,
events: {
- change: function(){
+ change: function () {
setAttr('radialshift', this.value);
}
}
}],
- callback: function(){
+ callback: function () {
$('#star_panel').hide();
// var endChanges = function(){};
},
- mouseDown: function(opts){
+ mouseDown: function (opts) {
var rgb = svgCanvas.getColor('fill');
// var ccRgbEl = rgb.substring(1, rgb.length);
var sRgb = svgCanvas.getColor('stroke');
// var ccSRgbEl = sRgb.substring(1, rgb.length);
var sWidth = svgCanvas.getStrokeWidth();
- if (svgCanvas.getMode() == 'star') {
+ if (svgCanvas.getMode() === 'star') {
started = true;
newFO = S.addSvgElementFromJson({
@@ -141,11 +141,11 @@ svgEditor.addExtension('star', function(S){'use strict';
};
}
},
- mouseMove: function(opts){
+ mouseMove: function (opts) {
if (!started) {
return;
}
- if (svgCanvas.getMode() == 'star') {
+ if (svgCanvas.getMode() === 'star') {
var x = opts.mouse_x;
var y = opts.mouse_y;
var c = $(newFO).attr(['cx', 'cy', 'point', 'orient', 'fill', 'strokecolor', 'strokeWidth', 'radialshift']);
@@ -158,9 +158,9 @@ svgEditor.addExtension('star', function(S){'use strict';
var s;
for (s = 0; point >= s; s++) {
var angle = 2.0 * Math.PI * (s / point);
- if ('point' == orient) {
+ if (orient === 'point') {
angle -= (Math.PI / 2);
- } else if ('edge' == orient) {
+ } else if (orient === 'edge') {
angle = (angle + (Math.PI / point)) - (Math.PI / 2);
}
@@ -169,11 +169,11 @@ svgEditor.addExtension('star', function(S){'use strict';
polyPoints += x + ',' + y + ' ';
- if (null != inradius) {
+ if (inradius != null) {
angle = (2.0 * Math.PI * (s / point)) + (Math.PI / point);
- if ('point' == orient) {
+ if (orient === 'point') {
angle -= (Math.PI / 2);
- } else if ('edge' == orient) {
+ } else if (orient === 'edge') {
angle = (angle + (Math.PI / point)) - (Math.PI / 2);
}
angle += radialShift;
@@ -188,25 +188,24 @@ svgEditor.addExtension('star', function(S){'use strict';
newFO.setAttributeNS(null, 'fill', fill);
newFO.setAttributeNS(null, 'stroke', strokecolor);
newFO.setAttributeNS(null, 'stroke-width', strokewidth);
- shape = newFO.getAttributeNS(null, 'shape');
+ /* var shape = */ newFO.getAttributeNS(null, 'shape');
return {
started: true
};
}
-
},
- mouseUp: function(){
- if (svgCanvas.getMode() == 'star') {
+ mouseUp: function () {
+ if (svgCanvas.getMode() === 'star') {
var attrs = $(newFO).attr(['r']);
// svgCanvas.addToSelection([newFO], true);
return {
- keep: (attrs.r != 0),
+ keep: (attrs.r !== '0'),
element: newFO
};
}
},
- selectedChanged: function(opts){
+ selectedChanged: function (opts) {
// Use this to update the current selected elements
selElems = opts.elems;
@@ -220,8 +219,7 @@ svgEditor.addExtension('star', function(S){'use strict';
$('#starNumPoints').val(elem.getAttribute('point'));
$('#radialShift').val(elem.getAttribute('radialshift'));
showPanel(true);
- }
- else {
+ } else {
showPanel(false);
}
} else {
@@ -229,7 +227,7 @@ svgEditor.addExtension('star', function(S){'use strict';
}
}
},
- elementChanged: function(opts){
+ elementChanged: function (opts) {
// var elem = opts.elems[0];
}
};
diff --git a/editor/extensions/ext-storage.js b/editor/extensions/ext-storage.js
index adcffb74..edb8e814 100644
--- a/editor/extensions/ext-storage.js
+++ b/editor/extensions/ext-storage.js
@@ -1,5 +1,5 @@
-/*globals svgEditor, svgCanvas, $, widget*/
-/*jslint vars: true, eqeq: true, regexp: true, continue: true*/
+/* eslint-disable no-var */
+/* globals svgEditor, svgCanvas, $, widget */
/*
* ext-storage.js
*
@@ -26,7 +26,7 @@ TODOS
2. We might provide control of storage settings through the UI besides the
initial (or URL-forced) dialog.
*/
-svgEditor.addExtension('storage', function() {
+svgEditor.addExtension('storage', function () {
// We could empty any already-set data for users when they decline storage,
// but it would be a risk for users who wanted to store but accidentally
// said "no"; instead, we'll let those who already set it, delete it themselves;
@@ -53,8 +53,7 @@ svgEditor.addExtension('storage', function() {
loc.href = loc.href.replace(/([&?])storagePrompt=[^&]*(&?)/, function (n0, n1, amp) {
return (val ? n1 : '') + val + (!val && amp ? n1 : (amp || ''));
});
- }
- else {
+ } else {
loc.href += (loc.href.indexOf('?') > -1 ? '&' : '?') + val;
}
}
@@ -63,22 +62,21 @@ svgEditor.addExtension('storage', function() {
var name = 'svgedit-' + svgEditor.curConfig.canvasName;
if (!val) {
storage.removeItem(name);
- }
- else {
+ } else {
storage.setItem(name, val);
}
}
}
-
+
function expireCookie (cookie) {
document.cookie = encodeURIComponent(cookie) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
}
-
+
function removeStoragePrefCookie () {
expireCookie('store');
}
-
- function emptyStorage() {
+
+ function emptyStorage () {
setSVGContentStorage('');
var name;
for (name in svgEditor.curPrefs) {
@@ -91,8 +89,8 @@ svgEditor.addExtension('storage', function() {
}
}
}
-
-// emptyStorage();
+
+ // emptyStorage();
/**
* Listen for unloading: If and only if opted in by the user, set the content
@@ -103,14 +101,14 @@ svgEditor.addExtension('storage', function() {
* 3. Use localStorage (where available) or cookies to set preferences.
*/
function setupBeforeUnloadListener () {
- window.addEventListener('beforeunload', function(e) {
+ window.addEventListener('beforeunload', function (e) {
// Don't save anything unless the user opted in to storage
if (!document.cookie.match(/(?:^|;\s*)store=(?:prefsAndContent|prefsOnly)/)) {
return;
}
var key;
if (document.cookie.match(/(?:^|;\s*)store=prefsAndContent/)) {
- setSVGContentStorage(svgCanvas.getSvgString());
+ setSVGContentStorage(svgCanvas.getSvgString());
}
svgEditor.setConfig({no_save_warning: true}); // No need for explicit saving at all once storage is on
@@ -121,18 +119,16 @@ svgEditor.addExtension('storage', function() {
for (key in curPrefs) {
if (curPrefs.hasOwnProperty(key)) { // It's our own config, so we don't need to iterate up the prototype chain
var val = curPrefs[key],
- store = (val != undefined);
+ store = (val !== undefined);
key = 'svg-edit-' + key;
if (!store) {
continue;
}
if (storage) {
storage.setItem(key, val);
- }
- else if (window.widget) {
+ } else if (window.widget) {
widget.setPreferenceForKey(val, key);
- }
- else {
+ } else {
val = encodeURIComponent(val);
document.cookie = encodeURIComponent(key) + '=' + val + '; expires=Fri, 31 Dec 9999 23:59:59 GMT';
}
@@ -195,7 +191,6 @@ svgEditor.addExtension('storage', function() {
)
// ...then show the storage prompt.
)) {
-
var options = [];
if (storage) {
options.unshift(
@@ -203,8 +198,7 @@ svgEditor.addExtension('storage', function() {
{value: 'prefsOnly', text: uiStrings.confirmSetStorage.storagePrefsOnly},
{value: 'noPrefsOrContent', text: uiStrings.confirmSetStorage.storageNoPrefsOrContent}
);
- }
- else {
+ } else {
options.unshift(
{value: 'prefsOnly', text: uiStrings.confirmSetStorage.storagePrefs},
{value: 'noPrefsOrContent', text: uiStrings.confirmSetStorage.storageNoPrefs}
@@ -242,8 +236,7 @@ svgEditor.addExtension('storage', function() {
replaceStoragePrompt();
return;
}
- }
- else { // The user does not wish storage (or cancelled, which we treat equivalently)
+ } else { // The user does not wish storage (or cancelled, which we treat equivalently)
removeStoragePrefCookie();
if (pref && // If the user explicitly expresses wish for no storage
emptyStorageOnDecline
@@ -259,21 +252,21 @@ svgEditor.addExtension('storage', function() {
// Reset width/height of dialog (e.g., for use by Export)
$('#dialog_container')[0].style.width = oldContainerWidth;
- $('#dialog_container')[0].style.marginLeft = oldContainerMarginLeft;
+ $('#dialog_container')[0].style.marginLeft = oldContainerMarginLeft;
$('#dialog_content')[0].style.height = oldContentHeight;
$('#dialog_container')[0].style.height = oldContainerHeight;
-
+
// It should be enough to (conditionally) add to storage on
// beforeunload, but if we wished to update immediately,
// we might wish to try setting:
// svgEditor.setConfig({noStorageOnLoad: true});
// and then call:
// svgEditor.loadContentAndPrefs();
-
+
// We don't check for noStorageOnLoad here because
// the prompt gives the user the option to store data
setupBeforeUnloadListener();
-
+
svgEditor.storagePromptClosed = true;
},
null,
@@ -284,8 +277,7 @@ svgEditor.addExtension('storage', function() {
tooltip: uiStrings.confirmSetStorage.rememberTooltip
}
);
- }
- else if (!noStorageOnLoad || forceStorage) {
+ } else if (!noStorageOnLoad || forceStorage) {
setupBeforeUnloadListener();
}
}
diff --git a/editor/extensions/ext-webappfind.js b/editor/extensions/ext-webappfind.js
index 1fe2f776..456001b4 100644
--- a/editor/extensions/ext-webappfind.js
+++ b/editor/extensions/ext-webappfind.js
@@ -1,67 +1,67 @@
-/*globals svgEditor*/
+/* eslint-disable no-var */
+/* globals svgEditor */
/*
Depends on Firefox add-on and executables from https://github.com/brettz9/webappfind
Todos:
1. See WebAppFind Readme for SVG-related todos
*/
-(function () {'use strict';
+(function () {
+'use strict';
var pathID,
- saveMessage = 'webapp-save',
- readMessage = 'webapp-read',
- excludedMessages = [readMessage, saveMessage];
+ saveMessage = 'webapp-save',
+ readMessage = 'webapp-read',
+ excludedMessages = [readMessage, saveMessage];
-window.addEventListener('message', function(e) {
- if (e.origin !== window.location.origin || // PRIVACY AND SECURITY! (for viewing and saving, respectively)
- (!Array.isArray(e.data) || excludedMessages.indexOf(e.data[0]) > -1) // Validate format and avoid our post below
- ) {
- return;
- }
- var svgString,
- messageType = e.data[0];
- switch (messageType) {
- case 'webapp-view':
- // Populate the contents
- pathID = e.data[1];
-
- svgString = e.data[2];
- svgEditor.loadFromString(svgString);
-
- /*if ($('#tool_save_file')) {
- $('#tool_save_file').disabled = false;
- }*/
- break;
- case 'webapp-save-end':
- alert('save complete for pathID ' + e.data[1] + '!');
- break;
- default:
- throw 'Unexpected mode';
- }
+window.addEventListener('message', function (e) {
+ if (e.origin !== window.location.origin || // PRIVACY AND SECURITY! (for viewing and saving, respectively)
+ (!Array.isArray(e.data) || excludedMessages.indexOf(e.data[0]) > -1) // Validate format and avoid our post below
+ ) {
+ return;
+ }
+ var svgString,
+ messageType = e.data[0];
+ switch (messageType) {
+ case 'webapp-view':
+ // Populate the contents
+ pathID = e.data[1];
+
+ svgString = e.data[2];
+ svgEditor.loadFromString(svgString);
+
+ /* if ($('#tool_save_file')) {
+ $('#tool_save_file').disabled = false;
+ } */
+ break;
+ case 'webapp-save-end':
+ alert('save complete for pathID ' + e.data[1] + '!');
+ break;
+ default:
+ throw new Error('Unexpected mode');
+ }
}, false);
window.postMessage([readMessage], window.location.origin !== 'null' ? window.location.origin : '*'); // Avoid "null" string error for file: protocol (even though file protocol not currently supported by add-on)
-svgEditor.addExtension('WebAppFind', function() {
-
- return {
- name: 'WebAppFind',
- svgicons: svgEditor.curConfig.extPath + 'webappfind-icon.svg',
- buttons: [{
- id: 'webappfind_save', //
- type: 'app_menu',
- title: 'Save Image back to Disk',
- position: 4, // Before 0-based index position 4 (after the regular "Save Image (S)")
- events: {
- click: function () {
- if (!pathID) { // Not ready yet as haven't received first payload
- return;
- }
- window.postMessage([saveMessage, pathID, svgEditor.canvas.getSvgString()], window.location.origin);
- }
- }
- }]
- };
+svgEditor.addExtension('WebAppFind', function () {
+ return {
+ name: 'WebAppFind',
+ svgicons: svgEditor.curConfig.extPath + 'webappfind-icon.svg',
+ buttons: [{
+ id: 'webappfind_save', //
+ type: 'app_menu',
+ title: 'Save Image back to Disk',
+ position: 4, // Before 0-based index position 4 (after the regular "Save Image (S)")
+ events: {
+ click: function () {
+ if (!pathID) { // Not ready yet as haven't received first payload
+ return;
+ }
+ window.postMessage([saveMessage, pathID, svgEditor.canvas.getSvgString()], window.location.origin);
+ }
+ }
+ }]
+ };
});
-
}());
diff --git a/editor/extensions/ext-xdomain-messaging.js b/editor/extensions/ext-xdomain-messaging.js
index 4efcb1a4..cc7839bf 100644
--- a/editor/extensions/ext-xdomain-messaging.js
+++ b/editor/extensions/ext-xdomain-messaging.js
@@ -1,12 +1,14 @@
+/* eslint-disable no-var */
+/* globals svgEditor, svgCanvas */
/**
* Should not be needed for same domain control (just call via child frame),
* but an API common for cross-domain and same domain use can be found
* in embedapi.js with a demo at embedapi.html
*/
-/*globals svgEditor, svgCanvas*/
-svgEditor.addExtension('xdomain-messaging', function() {'use strict';
+svgEditor.addExtension('xdomain-messaging', function () {
+ 'use strict';
try {
- window.addEventListener('message', function(e) {
+ window.addEventListener('message', function (e) {
// We accept and post strings for the sake of IE9 support
if (typeof e.data !== 'string' || e.data.charAt() === '|') {
return;
@@ -35,8 +37,7 @@ svgEditor.addExtension('xdomain-messaging', function() {'use strict';
}
e.source.postMessage(JSON.stringify(message), '*');
}, false);
- }
- catch (err) {
+ } catch (err) {
console.log('Error with xdomain message listener: ' + err);
}
});
diff --git a/editor/extensions/fileopen.php b/editor/extensions/fileopen.php
index d2edbbbe..f2f96dbb 100644
--- a/editor/extensions/fileopen.php
+++ b/editor/extensions/fileopen.php
@@ -11,30 +11,30 @@
*/
// Very minimal PHP file, all we do is Base64 encode the uploaded file and
// return it to the editor
-
+
if (!isset($_REQUEST['type'])) {
- echo "No type given";
+ echo 'No type given';
exit;
}
$type = $_REQUEST['type'];
if (!in_array($type, array('load_svg', 'import_svg', 'import_img'))) {
- echo "Not a recognized type";
+ echo 'Not a recognized type';
exit;
}
require('allowedMimeTypes.php');
-
+
$file = $_FILES['svg_file']['tmp_name'];
-
+
$output = file_get_contents($file);
-
+
$prefix = '';
// Make Data URL prefix for import image
if ($type == 'import_img') {
$info = getimagesize($file);
if (!in_array($info['mime'], $allowedMimeTypesBySuffix)) {
- echo "Disallowed MIME for supplied file";
+ echo 'Disallowed MIME for supplied file';
exit;
}
$prefix = 'data:' . $info['mime'] . ';base64,';
@@ -45,7 +45,7 @@
@@ -11,59 +12,6 @@
logo.png
-
+