From febb014b9a878b0cc1f98e48f66a942c1395e31f Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Dec 2017 16:30:30 +0400 Subject: [PATCH] remove unused staticPrefix from configs --- configs/ide/default.js | 57 ++----------------- plugins/c9.ide.ace.gotoline/gotoline.js | 1 - plugins/c9.ide.ace.gotoline/gotoline_test.js | 5 +- plugins/c9.ide.ace.statusbar/statusbar.js | 2 - plugins/c9.ide.ace/ace.js | 2 +- plugins/c9.ide.behaviors/dashboard.js | 2 +- plugins/c9.ide.behaviors/page.js | 2 +- plugins/c9.ide.collab/collab.js | 3 +- plugins/c9.ide.collab/collab_test.js | 4 -- plugins/c9.ide.collab/members/members.js | 3 +- plugins/c9.ide.collab/notifications/bubble.js | 2 - .../notifications/notifications.js | 3 +- .../c9.ide.collab/timeslider/timeslider.js | 6 +- plugins/c9.ide.console/console.js | 2 +- plugins/c9.ide.dialog.common/error.js | 3 +- plugins/c9.ide.dialog.common/notification.js | 3 +- .../c9.ide.find.infiles/findinfiles_test.js | 1 - plugins/c9.ide.find.replace/findreplace.css | 4 +- plugins/c9.ide.find.replace/findreplace.js | 4 +- .../c9.ide.find.replace/findreplace_test.js | 1 - plugins/c9.ide.guide/guide.js | 2 +- plugins/c9.ide.help/help.js | 4 +- plugins/c9.ide.imgeditor/imgeditor.js | 3 +- plugins/c9.ide.immediate/immediate.js | 2 +- plugins/c9.ide.installer/gui.js | 2 +- plugins/c9.ide.language.core/outline.js | 7 +-- plugins/c9.ide.layout.classic/layout.js | 2 - plugins/c9.ide.openfiles/openfiles.js | 5 +- plugins/c9.ide.panels/panels.js | 2 - .../mock/c9.ide.example3/plugin.js | 2 +- .../templates/example.templates | 2 - .../templates/plugin.default/plugin.js | 2 +- plugins/c9.ide.preferences/preferences.js | 2 +- plugins/c9.ide.preview/preview.js | 2 +- .../c9.ide.run.debug/debuggers/debugger.js | 2 - plugins/c9.ide.run/output.js | 2 +- plugins/c9.ide.scm/scm.commit.js | 2 +- .../c9.ide.terminal.monitor/message_view.js | 2 +- plugins/c9.ide.terminal/terminal.js | 2 +- plugins/c9.ide.test/all.js | 2 +- plugins/c9.ide.tree/tree.js | 2 +- plugins/c9.ide.ui/widgets.list.js | 2 +- plugins/c9.ide.upload/upload.js | 2 +- plugins/c9.ide.upload/upload_progress.js | 4 +- plugins/c9.ide.welcome/welcome.js | 3 +- 45 files changed, 40 insertions(+), 134 deletions(-) diff --git a/configs/ide/default.js b/configs/ide/default.js index cb53d374..9930230e 100644 --- a/configs/ide/default.js +++ b/configs/ide/default.js @@ -91,7 +91,6 @@ module.exports = function(options) { "plugins/c9.ide.plugins/gui", // { // packagePath: "plugins/c9.ide.plugins/test", - // staticPrefix: staticPrefix + "/plugins/c9.ide.plugins" // }, // VFS @@ -164,7 +163,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.openfiles/openfiles", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", defaultShow: options.local }, { @@ -177,21 +175,14 @@ module.exports = function(options) { "plugins/c9.ide.keys/editor", { packagePath: "plugins/c9.ide.ace/ace", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", workerPrefix: options.workerPrefix }, "plugins/c9.ide.ace/themes", "plugins/c9.ide.ace.stripws/stripws", "plugins/c9.ide.ace.repl/editor", // "plugins/c9.ide.ace.split/split", - { - packagePath: "plugins/c9.ide.ace.gotoline/gotoline", - staticPrefix: staticPrefix + "/plugins/c9.ide.ace.gotoline" - }, - { - packagePath: "plugins/c9.ide.ace.statusbar/statusbar", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" - }, + "plugins/c9.ide.ace.gotoline/gotoline", + "plugins/c9.ide.ace.statusbar/statusbar", "plugins/c9.ide.ace.keymaps/keymaps", "plugins/c9.ide.ace.keymaps/cli", @@ -212,10 +203,7 @@ module.exports = function(options) { node: options.nodeBin, local: options.local, }, - { - packagePath: "plugins/c9.ide.find.infiles/findinfiles", - staticPrefix: staticPrefix + "/plugins/c9.ide.find.infiles" - }, + "plugins/c9.ide.find.infiles/findinfiles", { packagePath: "plugins/c9.ide.find.replace/findreplace", staticPrefix: staticPrefix + "/plugins/c9.ide.find.replace" @@ -224,7 +212,6 @@ module.exports = function(options) { // UI { packagePath: "plugins/c9.ide.ui/ui", - staticPrefix: staticPrefix + "/plugins/c9.ide.ui" }, "plugins/c9.ide.ui/anims", "plugins/c9.ide.ui/tooltip", @@ -233,10 +220,7 @@ module.exports = function(options) { autoInit: !options.local }, "plugins/c9.ide.ui/forms", - { - packagePath: "plugins/c9.ide.ui/widgets.list", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" - }, + "plugins/c9.ide.ui/widgets.list", "plugins/c9.ide.ui/widgets.tree", "plugins/c9.ide.ui/widgets.datagrid", "plugins/c9.ide.ui/widgets.terminal", @@ -255,11 +239,9 @@ module.exports = function(options) { "plugins/c9.ide.dialog.common/upsell", { packagePath: "plugins/c9.ide.dialog.common/error", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, { packagePath: "plugins/c9.ide.dialog.common/notification", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, { packagePath: "plugins/c9.ide.dialog.login/login", @@ -413,7 +395,6 @@ module.exports = function(options) { { packagePath: "plugins/c9.ide.run/run", base: workspaceDir, - staticPrefix: staticPrefix + "/plugins/c9.ide.run", tmux: options.tmux, runners: runners, installPath: options.correctedInstallPath, @@ -421,7 +402,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.run/gui", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", defaultConfigs: {} }, { @@ -435,7 +415,6 @@ module.exports = function(options) { // "plugins/c9.ide.run.debug/debuggers/sourcemap", { packagePath: "plugins/c9.ide.run.debug/debuggers/debugger", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, { packagePath: "plugins/c9.ide.run.debug/debuggers/v8/v8debugger", @@ -450,7 +429,6 @@ module.exports = function(options) { "plugins/c9.ide.run.debug/callstack", { packagePath: "plugins/c9.ide.immediate/immediate", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, "plugins/c9.ide.immediate/evaluator", "plugins/c9.ide.immediate/evaluators/browserjs", @@ -471,7 +449,6 @@ module.exports = function(options) { root: workspaceDir, tmpdir: options.tmpdir, shell: options.shell || "", - staticPrefix: staticPrefix + "/plugins/c9.ide.terminal", installPath: options.correctedInstallPath }, { @@ -487,18 +464,15 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.terminal.monitor/message_view", - staticPrefix: options.staticPrefix + "/plugins/c9.ide.layout.classic" }, "plugins/c9.ide.terminal/opentermhere", { packagePath: "plugins/c9.ide.run/output", - staticPrefix: options.staticPrefix + "/plugins/c9.ide.layout.classic", tmux: options.tmux, basePath: workspaceDir }, { packagePath: "plugins/c9.ide.console/console", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", defaultState: options.project.scmurl ? { type: "pane", nodes: [{ @@ -560,7 +534,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.upload/upload", - staticPrefix: staticPrefix + "/plugins/c9.ide.upload" }, { packagePath: "plugins/c9.ide.upload/upload_manager", @@ -568,7 +541,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.upload/upload_progress", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, { packagePath: "plugins/c9.ide.navigate/navigate", @@ -579,11 +551,9 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.language.core/outline", - staticPrefix: staticPrefix + "/plugins/c9.ide.language" }, { packagePath: "plugins/c9.ide.panels/panels", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", defaultActiveLeft: "tree" }, "plugins/c9.ide.panels/panel", @@ -591,10 +561,7 @@ module.exports = function(options) { "plugins/c9.ide.processlist/processlist", // Installer - { - packagePath: "plugins/c9.ide.installer/gui", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", - }, + "plugins/c9.ide.installer/gui", "plugins/c9.automate/automate", "plugins/c9.ide.installer/commands/centos", "plugins/c9.ide.installer/commands/darwin", @@ -621,7 +588,6 @@ module.exports = function(options) { // Previewer { packagePath: "plugins/c9.ide.preview/preview", - staticPrefix: staticPrefix + "/plugins/c9.ide.preview", defaultPreviewer: "preview.browser", previewUrl: options.previewUrl, local: options.local @@ -682,7 +648,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.welcome/welcome", - staticPrefix: staticPrefix + "/plugins/c9.ide.welcome", intro: "Welcome to Cloud9. Use this welcome screen " + "to tweak the look & feel of the Cloud9 user interface. ", checkOS: true @@ -697,12 +662,10 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.help/help", - staticPrefix: staticPrefix + "/plugins/c9.ide.help", hosted: hosted }, { packagePath: "plugins/c9.ide.guide/guide", - staticPrefix: staticPrefix + "/plugins/c9.ide.guide" }, { packagePath: "plugins/c9.ide.guide/default" @@ -726,15 +689,12 @@ module.exports = function(options) { "plugins/c9.ide.behaviors/tabs", // { // packagePath: "plugins/c9.ide.behaviors/dashboard", - // staticPrefix : staticPrefix + "/plugins/c9.ide.behaviors" // }, { packagePath: "plugins/c9.ide.behaviors/page", - staticPrefix: staticPrefix + "/plugins/c9.ide.behaviors" }, { packagePath: "plugins/c9.ide.preferences/preferences", - staticPrefix: staticPrefix + "/plugins/c9.ide.preferences" }, "plugins/c9.ide.preferences/preferencepanel", { @@ -750,7 +710,6 @@ module.exports = function(options) { "plugins/c9.ide.preferences/experimental", { packagePath: "plugins/c9.ide.login/login", - staticPrefix: staticPrefix + "/plugins/c9.ide.login", ideBaseUrl: options.ideBaseUrl, dashboardUrl: options.dashboardUrl, accountUrl: options.accountUrl, @@ -761,7 +720,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.collab/notifications/bubble", - staticPrefix: staticPrefix + "/plugins/c9.ide.collab/notifications" }, "plugins/c9.ide.behaviors/zentabs", @@ -773,7 +731,6 @@ module.exports = function(options) { "plugins/c9.ide.test/testrunner", { packagePath: "plugins/c9.ide.test/all", - staticPrefix: staticPrefix + "/plugins/c9.ide.test" }, "plugins/c9.ide.test/results", "plugins/c9.ide.test/coverage", @@ -784,7 +741,6 @@ module.exports = function(options) { // git integration v2 // { // packagePath: "plugins/c9.ide.scm/scm.commit", - // staticPrefix: staticPrefix + "/plugins/c9.ide.scm" // }, // "plugins/c9.ide.scm/scm", // "plugins/c9.ide.scm/scm.branches", @@ -861,12 +817,10 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.collab/cursor_layer", - staticPrefix: staticPrefix + "/plugins/c9.ide.collab" }, "plugins/c9.ide.collab/author_layer", { packagePath: "plugins/c9.ide.collab/timeslider/timeslider", - staticPrefix: staticPrefix + "/plugins/c9.ide.collab/timeslider" }, // Collab panels { @@ -882,7 +836,6 @@ module.exports = function(options) { }, { packagePath: "plugins/c9.ide.collab/members/members", - staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic" }, { packagePath: "plugins/c9.ide.collab/chat/chat", diff --git a/plugins/c9.ide.ace.gotoline/gotoline.js b/plugins/c9.ide.ace.gotoline/gotoline.js index e17890a2..ccfebf0e 100644 --- a/plugins/c9.ide.ace.gotoline/gotoline.js +++ b/plugins/c9.ide.ace.gotoline/gotoline.js @@ -93,7 +93,6 @@ define(function(require, exports, module) { ui.insertSkin({ name: "gotoline", data: skin, - "media-path": options.staticPrefix + "/images/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.ace.gotoline/gotoline_test.js b/plugins/c9.ide.ace.gotoline/gotoline_test.js index 30bcd6e0..f5da8cef 100644 --- a/plugins/c9.ide.ace.gotoline/gotoline_test.js +++ b/plugins/c9.ide.ace.gotoline/gotoline_test.js @@ -42,10 +42,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) "plugins/c9.ide.editors/pane", "plugins/c9.ide.editors/tab", "plugins/c9.ide.ace/ace", - { - packagePath: "plugins/c9.ide.ace.gotoline/gotoline", - staticPrefix: "plugins/c9.ide.ace.gotoline" - }, + "plugins/c9.ide.ace.gotoline/gotoline", "plugins/c9.ide.keys/commands", "plugins/c9.fs/proc", "plugins/c9.vfs.client/vfs_client", diff --git a/plugins/c9.ide.ace.statusbar/statusbar.js b/plugins/c9.ide.ace.statusbar/statusbar.js index 51400fda..e4e003c6 100644 --- a/plugins/c9.ide.ace.statusbar/statusbar.js +++ b/plugins/c9.ide.ace.statusbar/statusbar.js @@ -207,8 +207,6 @@ define(function(require, exports, module) { ui.insertSkin({ name: "c9statusbar", data: skin, - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, handle); } diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js index d2c0141f..520d665a 100644 --- a/plugins/c9.ide.ace/ace.js +++ b/plugins/c9.ide.ace/ace.js @@ -567,7 +567,7 @@ define(function(require, exports, module) { }, handle); // CSS - ui.insertCss(cssString, options.staticPrefix, handle); + ui.insertCss(cssString, null, handle); }); handle.on("unload", function() { drawn = false; diff --git a/plugins/c9.ide.behaviors/dashboard.js b/plugins/c9.ide.behaviors/dashboard.js index 1f45d02b..728f80c7 100644 --- a/plugins/c9.ide.behaviors/dashboard.js +++ b/plugins/c9.ide.behaviors/dashboard.js @@ -22,7 +22,7 @@ define(function(require, exports, module) { // @todo how to make sure this happens only once? var css = require("text!./style.css"); - ui.insertCss(css, options.staticPrefix, handle); + ui.insertCss(css, null, handle); dashboard.on("widgetCreate", function(e) { if (e.widget.dashboard.configurable) diff --git a/plugins/c9.ide.behaviors/page.js b/plugins/c9.ide.behaviors/page.js index 492cce13..35d00bd6 100644 --- a/plugins/c9.ide.behaviors/page.js +++ b/plugins/c9.ide.behaviors/page.js @@ -29,7 +29,7 @@ define(function(require, exports, module) { loaded = true; // Insert CSS - ui.insertCss(css, options.staticPrefix, handle); + ui.insertCss(css, null, handle); settings.on("read", function() { settings.setDefaults("user/tabs", [["autoclosepanes", true]]); diff --git a/plugins/c9.ide.collab/collab.js b/plugins/c9.ide.collab/collab.js index 34445ad8..822e93ba 100644 --- a/plugins/c9.ide.collab/collab.js +++ b/plugins/c9.ide.collab/collab.js @@ -36,7 +36,6 @@ define(function(require, exports, module) { var menus = imports.menus; var css = require("text!./collab.css"); - var staticPrefix = options.staticPrefix; var plugin = new Panel("Ajax.org", main.consumes, { index: 45, @@ -113,7 +112,7 @@ define(function(require, exports, module) { } }); - ui.insertCss(css, staticPrefix, plugin); + ui.insertCss(css, null, plugin); window.addEventListener("unload", function() { leaveAll(); diff --git a/plugins/c9.ide.collab/collab_test.js b/plugins/c9.ide.collab/collab_test.js index e921be19..09007d00 100644 --- a/plugins/c9.ide.collab/collab_test.js +++ b/plugins/c9.ide.collab/collab_test.js @@ -74,21 +74,17 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], }, { packagePath: "plugins/c9.ide.collab/cursor_layer", - staticPrefix: "plugins/c9.ide.collab" }, "plugins/c9.ide.collab/author_layer", { packagePath: "plugins/c9.ide.collab/timeslider/timeslider", - staticPrefix: "plugins/c9.ide.collab/timeslider" }, { packagePath: "plugins/c9.ide.collab/chat/chat", - staticPrefix: "plugins/c9.ide.collab/chat" }, "plugins/c9.ide.collab/members/members_panel", { packagePath: "plugins/c9.ide.collab/members/members", - staticPrefix: "plugins/c9.ide.collab/members" }, { diff --git a/plugins/c9.ide.collab/members/members.js b/plugins/c9.ide.collab/members/members.js index 54edc97b..dc403efd 100644 --- a/plugins/c9.ide.collab/members/members.js +++ b/plugins/c9.ide.collab/members/members.js @@ -13,7 +13,6 @@ define(function(require, exports, module) { var panels = imports.panels; var css = require("text!./members.css"); - var staticPrefix = options.staticPrefix; var membersPanel; @@ -29,7 +28,7 @@ define(function(require, exports, module) { loaded = true; // Import CSS - ui.insertCss(css, staticPrefix, plugin); + ui.insertCss(css, null, plugin); membersPanel = new MembersPanel("Ajax.org", main.consumes, { showTabs: true, diff --git a/plugins/c9.ide.collab/notifications/bubble.js b/plugins/c9.ide.collab/notifications/bubble.js index be1010c0..5e571561 100644 --- a/plugins/c9.ide.collab/notifications/bubble.js +++ b/plugins/c9.ide.collab/notifications/bubble.js @@ -16,7 +16,6 @@ define(function(require, exports, module) { /***** Initialization *****/ var plugin = new Plugin("Ajax.org", main.consumes); - var staticPrefix = options.staticPrefix; var skin = require("text!./skin.xml"); var markup = require("text!./bubble.xml"); var emit = plugin.getEmitter(); @@ -53,7 +52,6 @@ define(function(require, exports, module) { ui.insertSkin({ name: "bubble", data: skin, - "media-path": staticPrefix + "/images/" }, plugin); ui.insertMarkup(layout.findParent(plugin), markup, plugin); diff --git a/plugins/c9.ide.collab/notifications/notifications.js b/plugins/c9.ide.collab/notifications/notifications.js index 746912ee..ed64c261 100644 --- a/plugins/c9.ide.collab/notifications/notifications.js +++ b/plugins/c9.ide.collab/notifications/notifications.js @@ -17,7 +17,6 @@ define(function(require, exports, module) { var workspace = imports["collab.workspace"]; var css = require("text!./notifications.css"); - var staticPrefix = options.staticPrefix; var oop = require("ace/lib/oop"); var Tree = require("ace_tree/tree"); @@ -45,7 +44,7 @@ define(function(require, exports, module) { loaded = true; // Needed now for bubble - ui.insertCss(css, staticPrefix, plugin); + ui.insertCss(css, null, plugin); notificationsDataProvider = new TreeData(); diff --git a/plugins/c9.ide.collab/timeslider/timeslider.js b/plugins/c9.ide.collab/timeslider/timeslider.js index 9d982c7d..6fad2cc0 100644 --- a/plugins/c9.ide.collab/timeslider/timeslider.js +++ b/plugins/c9.ide.collab/timeslider/timeslider.js @@ -25,7 +25,6 @@ define(function(require, exports, module) { var css = require("text!./timeslider.css"); var dom = require("ace/lib/dom"); - var staticPrefix = options.staticPrefix; var isLoading; var tsVisibleKey = "user/collab/@timeslider-visible"; @@ -166,7 +165,7 @@ define(function(require, exports, module) { drawn = true; ui.insertHtml(null, html, plugin); - ui.insertCss(css, staticPrefix, plugin); + ui.insertCss(css, null, plugin); function $(id) { return document.getElementById(id); @@ -217,14 +216,11 @@ define(function(require, exports, module) { // play/pause toggling playButton.addEventListener("mousedown", function(evt) { - // playButton.style["background-image"] = "url("+ staticPrefix + "/images/play_depressed.png)"; playButton.addEventListener("mouseup", function onMouseUp(evt2) { - // playButton.style["background-image"] = "url(" + staticPrefix + "/images/play_undepressed.png)"; playButton.removeEventListener("mouseup", onMouseUp); playpause(); }); document.addEventListener("mouseup", function onMouseUp(evt2) { - // playButton.style["background-image"] = "url(" + staticPrefix + "/images/play_undepressed.png)"; document.removeEventListener("mouseup", onMouseUp); }); }); diff --git a/plugins/c9.ide.console/console.js b/plugins/c9.ide.console/console.js index 992c9bd1..81e15dbb 100644 --- a/plugins/c9.ide.console/console.js +++ b/plugins/c9.ide.console/console.js @@ -126,7 +126,7 @@ define(function(require, module, exports) { if (drawn) return; drawn = true; - ui.insertCss(cssString, options.staticPrefix, plugin); + ui.insertCss(cssString, null, plugin); consoleRow = layout.findParent(plugin); container = consoleRow.appendChild(new ui.bar({ diff --git a/plugins/c9.ide.dialog.common/error.js b/plugins/c9.ide.dialog.common/error.js index 23cc5df7..5cfca6b7 100644 --- a/plugins/c9.ide.dialog.common/error.js +++ b/plugins/c9.ide.dialog.common/error.js @@ -25,8 +25,7 @@ define(function(require, exports, module) { var DISCONNECTDELAY = 1000; function load() { - ui.insertCss(require("text!./error.css"), - options.staticPrefix, plugin); + ui.insertCss(require("text!./error.css"), true, plugin); } function initDisconnectEvents(vfs) { diff --git a/plugins/c9.ide.dialog.common/notification.js b/plugins/c9.ide.dialog.common/notification.js index d4b51972..7fd7a89b 100644 --- a/plugins/c9.ide.dialog.common/notification.js +++ b/plugins/c9.ide.dialog.common/notification.js @@ -24,8 +24,7 @@ define(function(require, exports, module) { if (loaded) return false; loaded = true; - ui.insertCss(require("text!./notification.css"), - options.staticPrefix, plugin); + ui.insertCss(require("text!./notification.css"), null, plugin); layout.on("themeChange", function() { if (logo) { diff --git a/plugins/c9.ide.find.infiles/findinfiles_test.js b/plugins/c9.ide.find.infiles/findinfiles_test.js index d858f3b2..af9d2f00 100644 --- a/plugins/c9.ide.find.infiles/findinfiles_test.js +++ b/plugins/c9.ide.find.infiles/findinfiles_test.js @@ -51,7 +51,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], "plugins/c9.ide.ace/ace", { packagePath: "plugins/c9.ide.find.infiles/findinfiles", - staticPrefix: "plugins/c9.ide.find.infiles" }, { packagePath: "plugins/c9.ide.find/find", diff --git a/plugins/c9.ide.find.replace/findreplace.css b/plugins/c9.ide.find.replace/findreplace.css index 4b4645a4..18e2d010 100644 --- a/plugins/c9.ide.find.replace/findreplace.css +++ b/plugins/c9.ide.find.replace/findreplace.css @@ -18,10 +18,10 @@ } .btnquicksearchnav.btnquicksearchnavLeft .lbl span { - .image-2x("@{icon-path}/@{find-next-image}", 20px, 100px); + .image-2x("@{plugin-path}/icons/@{find-next-image}", 20px, 100px); } .btnquicksearchnav.btnquicksearchnavRight .lbl span { - .image-2x("@{icon-path}/@{find-previous-image}", 20px, 100px); + .image-2x("@{plugin-path}/icons/@{find-previous-image}", 20px, 100px); } .findInRangeMarker { diff --git a/plugins/c9.ide.find.replace/findreplace.js b/plugins/c9.ide.find.replace/findreplace.js index e5d066d3..1dd98f4d 100644 --- a/plugins/c9.ide.find.replace/findreplace.js +++ b/plugins/c9.ide.find.replace/findreplace.js @@ -184,14 +184,12 @@ define(function(require, exports, module) { drawn = true; // Import CSS - ui.insertCss(css, options.staticPrefix, plugin); + ui.insertCss(css, null, plugin); // Import Skin ui.insertSkin({ name: "searchreplace", data: skin, - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.find.replace/findreplace_test.js b/plugins/c9.ide.find.replace/findreplace_test.js index 536a99a8..cda66d5f 100644 --- a/plugins/c9.ide.find.replace/findreplace_test.js +++ b/plugins/c9.ide.find.replace/findreplace_test.js @@ -47,7 +47,6 @@ require(["lib/architect/architect", "lib/chai/chai", "text!plugins/c9.ide.layout }, { packagePath: "plugins/c9.ide.find.replace/findreplace", - staticPrefix: "plugins/c9.ide.find.replace" }, "plugins/c9.ide.keys/commands", "plugins/c9.ide.ui/anims", diff --git a/plugins/c9.ide.guide/guide.js b/plugins/c9.ide.guide/guide.js index eb50fed3..f7b0e95e 100644 --- a/plugins/c9.ide.guide/guide.js +++ b/plugins/c9.ide.guide/guide.js @@ -45,7 +45,7 @@ define(function(require, exports, module) { drawn = true; // Insert CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); // Draw the thingies thingies.forEach(drawThingy); diff --git a/plugins/c9.ide.help/help.js b/plugins/c9.ide.help/help.js index 22420ec3..765a3534 100644 --- a/plugins/c9.ide.help/help.js +++ b/plugins/c9.ide.help/help.js @@ -110,12 +110,10 @@ define(function(require, exports, module) { ui.insertSkin({ name: "help-skin", data: require("text!./skin.xml"), - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); // Import CSS - ui.insertCss(css, options.staticPrefix, plugin); + ui.insertCss(css, null, plugin); // Create UI elements ui.insertMarkup(null, markup, plugin); diff --git a/plugins/c9.ide.imgeditor/imgeditor.js b/plugins/c9.ide.imgeditor/imgeditor.js index 15d96fe9..1dc6c90c 100644 --- a/plugins/c9.ide.imgeditor/imgeditor.js +++ b/plugins/c9.ide.imgeditor/imgeditor.js @@ -37,8 +37,7 @@ define(function(require, exports, module) { drawn = true; // Insert CSS - ui.insertCss(require("text!./style.css"), - options.staticPrefix, handle); + ui.insertCss(require("text!./style.css"), null, handle); }; // @todo revert to saved doesnt work (same for file watcher reload) diff --git a/plugins/c9.ide.immediate/immediate.js b/plugins/c9.ide.immediate/immediate.js index 48256b9f..4368d5b5 100644 --- a/plugins/c9.ide.immediate/immediate.js +++ b/plugins/c9.ide.immediate/immediate.js @@ -83,7 +83,7 @@ define(function(require, exports, module) { }, handle); // Insert some CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, handle); + ui.insertCss(require("text!./style.css"), null, handle); }); // Search through pages diff --git a/plugins/c9.ide.installer/gui.js b/plugins/c9.ide.installer/gui.js index 8932c150..91028f52 100644 --- a/plugins/c9.ide.installer/gui.js +++ b/plugins/c9.ide.installer/gui.js @@ -179,7 +179,7 @@ define(function(require, exports, module) { if (drawn) return; drawn = true; - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); settings.on("user/installer/@auto", function() { cbAlways.setAttribute("checked", settings.get("user/installer/@auto")); diff --git a/plugins/c9.ide.language.core/outline.js b/plugins/c9.ide.language.core/outline.js index 859486b3..81abdd1b 100644 --- a/plugins/c9.ide.language.core/outline.js +++ b/plugins/c9.ide.language.core/outline.js @@ -42,7 +42,6 @@ define(function(require, exports, module) { var fullOutline = []; var ignoreFocusOnce = false; - var staticPrefix = options.staticPrefix; var tree, tdOutline, winOutline, textbox, treeParent; // UI Elements var originalLine, originalColumn, originalTab; @@ -249,13 +248,10 @@ define(function(require, exports, module) { function createProvider() { // Import CSS - ui.insertCss(require("text!./outline.css"), staticPrefix, plugin); + ui.insertCss(require("text!./outline.css"), null, plugin); // Define data provider tdOutline = new TreeData(); - - // Some global render metadata - tdOutline.staticPrefix = staticPrefix; } var drawn = false; @@ -603,7 +599,6 @@ define(function(require, exports, module) { fullOutline = []; ignoreFocusOnce = false; - // staticPrefix = options.staticPrefix; tree = null; tdOutline = null; diff --git a/plugins/c9.ide.layout.classic/layout.js b/plugins/c9.ide.layout.classic/layout.js index e68821b0..55b86cf1 100644 --- a/plugins/c9.ide.layout.classic/layout.js +++ b/plugins/c9.ide.layout.classic/layout.js @@ -83,8 +83,6 @@ define(function(require, exports, module) { // Load the skin ui.insertSkin({ "data": require("text!./skins.xml"), - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.openfiles/openfiles.js b/plugins/c9.ide.openfiles/openfiles.js index b217be94..352fe996 100644 --- a/plugins/c9.ide.openfiles/openfiles.js +++ b/plugins/c9.ide.openfiles/openfiles.js @@ -28,7 +28,6 @@ define(function(require, exports, module) { var plugin = new Plugin("Ajax.org", main.consumes); var emit = plugin.getEmitter(); - var staticPrefix = options.staticPrefix; // tree maximum height var showOpenFiles = false; @@ -100,7 +99,7 @@ define(function(require, exports, module) { drawn = true; // ace_tree customization '.openfiles' - ui.insertCss(require("text!./openfiles.css"), staticPrefix, plugin); + ui.insertCss(require("text!./openfiles.css"), null, plugin); tree.getElement("winOpenfiles", function(winOpenfiles) { treeParent = winOpenfiles; @@ -119,8 +118,6 @@ define(function(require, exports, module) { ofTree.renderer.setTheme({ cssClass: "filetree" }); // Assign the dataprovider ofTree.setDataProvider(ofDataProvider); - // Some global render metadata - ofDataProvider.staticPrefix = staticPrefix; layout.on("eachTheme", function(e) { var height = parseInt(ui.getStyleRule(".openfiles .ace_tree .tree-row", "height"), 10); diff --git a/plugins/c9.ide.panels/panels.js b/plugins/c9.ide.panels/panels.js index 577eddce..d568bb98 100644 --- a/plugins/c9.ide.panels/panels.js +++ b/plugins/c9.ide.panels/panels.js @@ -41,8 +41,6 @@ define(function(require, exports, module) { ui.insertSkin({ name: "panels", data: require("text!./skin.xml"), - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); menus.addItemByPath("Window/~", new ui.divider(), 40, plugin); diff --git a/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin.js b/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin.js index cff2ee8a..67f5f511 100644 --- a/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin.js +++ b/plugins/c9.ide.plugins/mock/c9.ide.example3/plugin.js @@ -76,7 +76,7 @@ define(function(require, exports, module) { ui.insertHtml(document.body, markup, plugin); // Insert CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); emit("draw"); } diff --git a/plugins/c9.ide.plugins/mock/c9.ide.example3/templates/example.templates b/plugins/c9.ide.plugins/mock/c9.ide.example3/templates/example.templates index 65246099..1cd8d9ac 100644 --- a/plugins/c9.ide.plugins/mock/c9.ide.example3/templates/example.templates +++ b/plugins/c9.ide.plugins/mock/c9.ide.example3/templates/example.templates @@ -39,8 +39,6 @@ section General ui.insertSkin({ name: "c9statusbar", data: require("text!./skin.xml"), - "media-path" : options.staticPrefix + "/images/", - "icon-path" : options.staticPrefix + "/icons/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.plugins/templates/plugin.default/plugin.js b/plugins/c9.ide.plugins/templates/plugin.default/plugin.js index 116ca252..45924a42 100644 --- a/plugins/c9.ide.plugins/templates/plugin.default/plugin.js +++ b/plugins/c9.ide.plugins/templates/plugin.default/plugin.js @@ -76,7 +76,7 @@ define(function(require, exports, module) { ui.insertHtml(document.body, markup, plugin); // Insert CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); emit("draw"); } diff --git a/plugins/c9.ide.preferences/preferences.js b/plugins/c9.ide.preferences/preferences.js index 60226c42..48362397 100644 --- a/plugins/c9.ide.preferences/preferences.js +++ b/plugins/c9.ide.preferences/preferences.js @@ -135,7 +135,7 @@ define(function(require, exports, module) { // Insert CSS var css = require("text!./preferences.css"); - ui.insertCss(css, options.staticPrefix, handle); + ui.insertCss(css, null, handle); // Create UI elements parent = e.tab.appendChild(new ui.hsplitbox({ diff --git a/plugins/c9.ide.preview/preview.js b/plugins/c9.ide.preview/preview.js index 9dcfc61e..7c546d25 100644 --- a/plugins/c9.ide.preview/preview.js +++ b/plugins/c9.ide.preview/preview.js @@ -286,7 +286,7 @@ define(function(require, exports, module) { // Import CSS var css = require("text!./preview.css"); - ui.insertCss(css, options.staticPrefix, handle); + ui.insertCss(css, null, handle); handleEmit.sticky("draw"); } diff --git a/plugins/c9.ide.run.debug/debuggers/debugger.js b/plugins/c9.ide.run.debug/debuggers/debugger.js index 34ac8b85..7127905f 100644 --- a/plugins/c9.ide.run.debug/debuggers/debugger.js +++ b/plugins/c9.ide.run.debug/debuggers/debugger.js @@ -134,8 +134,6 @@ define(function(require, exports, module) { ui.insertSkin({ name: "debugger", data: require("text!./skin.xml"), - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.run/output.js b/plugins/c9.ide.run/output.js index 506a4413..da0348fa 100644 --- a/plugins/c9.ide.run/output.js +++ b/plugins/c9.ide.run/output.js @@ -56,7 +56,7 @@ define(function(require, exports, module) { handle.on("load", function() { // Import CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, handle); + ui.insertCss(require("text!./style.css"), null, handle); commands.addCommand({ name: "showoutput", diff --git a/plugins/c9.ide.scm/scm.commit.js b/plugins/c9.ide.scm/scm.commit.js index f9fc8003..ad9ebf0b 100644 --- a/plugins/c9.ide.scm/scm.commit.js +++ b/plugins/c9.ide.scm/scm.commit.js @@ -96,7 +96,7 @@ define(function(require, exports, module) { var isCommitting; function load() { - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); plugin.setCommand({ name: "showcommit", diff --git a/plugins/c9.ide.terminal.monitor/message_view.js b/plugins/c9.ide.terminal.monitor/message_view.js index 317f0c29..68f0fcd9 100644 --- a/plugins/c9.ide.terminal.monitor/message_view.js +++ b/plugins/c9.ide.terminal.monitor/message_view.js @@ -25,7 +25,7 @@ define(function(require, exports, module) { loaded = true; // Load CSS - ui.insertCss(css, options.staticPrefix, plugin); + ui.insertCss(css, null, plugin); tabManager.on("tabAfterActivateSync", function() { toggleMessages(); diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js index 971e5532..eb51a240 100644 --- a/plugins/c9.ide.terminal/terminal.js +++ b/plugins/c9.ide.terminal/terminal.js @@ -73,7 +73,7 @@ define(function(require, exports, module) { } // Import the CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, handle); + ui.insertCss(require("text!./style.css"), null, handle); handle.on("load", function() { commands.addCommand({ diff --git a/plugins/c9.ide.test/all.js b/plugins/c9.ide.test/all.js index 7ae2dbc5..a0e6cc84 100644 --- a/plugins/c9.ide.test/all.js +++ b/plugins/c9.ide.test/all.js @@ -277,7 +277,7 @@ define(function(require, exports, module) { drawn = true; // Insert CSS - ui.insertCss(require("text!./style.css"), options.staticPrefix, plugin); + ui.insertCss(require("text!./style.css"), null, plugin); // Tree tree = new Tree({ diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index aa7127d7..af26581b 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -208,7 +208,7 @@ define(function(require, exports, module) { // Moved it here to enable it for filesave dialog. This should be // optimized away in the packed version var css = require("text!./style.css"); - ui.insertCss(css, staticPrefix, plugin); + ui.insertCss(css, null, plugin); ui.insertCss(util.getFileIconCss(staticPrefix), false, plugin); layout.on("eachTheme", function(e) { diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js index a2b8b03b..fad2b3c0 100644 --- a/plugins/c9.ide.ui/widgets.list.js +++ b/plugins/c9.ide.ui/widgets.list.js @@ -19,7 +19,7 @@ define(function(require, exports, module) { }; ui.on("load", function() { - ui.insertCss(require("text!./widgets.less"), options.staticPrefix, ui); + ui.insertCss(require("text!./widgets.less"), null, ui); }); /***** Constructors *****/ diff --git a/plugins/c9.ide.upload/upload.js b/plugins/c9.ide.upload/upload.js index e02ca554..84ffc817 100644 --- a/plugins/c9.ide.upload/upload.js +++ b/plugins/c9.ide.upload/upload.js @@ -287,7 +287,7 @@ define(function(require, exports, module) { } if (!winUploadFiles) { - ui.insertCss(css, options.staticPrefix, plugin); + ui.insertCss(css, null, plugin); ui.insertMarkup(null, winUploadFilesMarkup, plugin); winUploadFiles = plugin.getElement("winUploadFiles"); diff --git a/plugins/c9.ide.upload/upload_progress.js b/plugins/c9.ide.upload/upload_progress.js index bdacdb21..79160295 100644 --- a/plugins/c9.ide.upload/upload_progress.js +++ b/plugins/c9.ide.upload/upload_progress.js @@ -42,14 +42,12 @@ define(function(require, exports, module) { drawn = true; // load CSS - ui.insertCss(css, options.staticPrefix, plugin); + ui.insertCss(css, null, plugin); // Import Skin ui.insertSkin({ name: "uploadfiles", data: require("text!./markup/skin.xml"), - "media-path": options.staticPrefix + "/images/", - "icon-path": options.staticPrefix + "/icons/" }, plugin); // Create UI elements diff --git a/plugins/c9.ide.welcome/welcome.js b/plugins/c9.ide.welcome/welcome.js index 3e857352..9c34f260 100644 --- a/plugins/c9.ide.welcome/welcome.js +++ b/plugins/c9.ide.welcome/welcome.js @@ -98,8 +98,7 @@ define(function(require, exports, module) { } // Insert CSS - ui.insertCss(require("text!./style.css"), - options.staticPrefix, handle); + ui.insertCss(require("text!./style.css"), null, handle); } handle.on("load", load);