Skip to content
This repository has been archived by the owner on Oct 21, 2022. It is now read-only.

Commit

Permalink
Replace deprecated electron modules
Browse files Browse the repository at this point in the history
  • Loading branch information
sbauer322 authored and prertik committed Dec 27, 2018
1 parent e80ae29 commit 85bc3fd
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions deploy/core/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

var app = require('app'), // Module to control application life.
BrowserWindow = require('browser-window'), // Module to create native browser window.
var app = require('electron').app, // Module to control application life.
BrowserWindow = require('electron').BrowserWindow, // Module to create native browser window.
ipcMain = require("electron").ipcMain,
optimist = require('optimist');

Expand Down Expand Up @@ -101,7 +101,7 @@ function parseArgs() {
optimist.showHelp();
process.exit(0);
}
}
};

function start() {
app.commandLine.appendSwitch('remote-debugging-port', '8315');
Expand Down
4 changes: 2 additions & 2 deletions src/lt/objs/app.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
[lt.util.ipc :as ipc])
(:require-macros [lt.macros :refer [behavior]]))

(def remote (js/require "remote"))
(def remote (.-remote (js/require "electron")))
(def win (.getCurrentWindow remote))
(def frame (js/require "web-frame"))
(def frame (.-webFrame (js/require "electron")))
(def closing true)
(def default-zoom 1)

Expand Down
2 changes: 1 addition & 1 deletion src/lt/objs/cli.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[lt.objs.opener :as opener])
(:require-macros [lt.macros :refer [behavior]]))

(def remote (js/require "remote"))
(def remote (.-remote (js/require "electron")))

(defn open-paths [path-line-pairs add?]
(doseq [[path line] path-line-pairs
Expand Down
4 changes: 2 additions & 2 deletions src/lt/objs/dialogs.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
[lt.objs.app :as app])
(:require-macros [lt.macros :refer [behavior defui]]))

(def remote (js/require "remote"))
(def dialog (.require remote "dialog"))
(def remote (.-remote (js/require "electron")))
(def dialog (.-dialog remote))

(defn dir [obj event]
(let [files (.showOpenDialog dialog app/win #js {:properties #js ["openDirectory" "multiSelections"]})]
Expand Down
2 changes: 1 addition & 1 deletion src/lt/objs/files.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
;; https://github.com/shelljs/shelljs
(def ^:private shell (load/node-module "shelljs"))
;; https://github.com/electron/electron/blob/master/docs/api/shell.md
(def ^:private electron-shell (js/require "shell"))
(def ^:private electron-shell (.-shell (js/require "electron")))
(def ^:private os (js/require "os"))
(def ^:private data-path (platform/get-data-path))

Expand Down
8 changes: 4 additions & 4 deletions src/lt/objs/menu.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
[clojure.string :as string])
(:require-macros [lt.macros :refer [behavior]]))

(def remote (js/require "remote"))
(def Menu (.require remote "menu"))
(def MenuItem (.require remote "menu-item"))
(def remote (.-remote (js/require "electron")))
(def Menu (.-Menu remote))
(def MenuItem (.-MenuItem remote))

(declare submenu)

Expand Down Expand Up @@ -178,7 +178,7 @@
:triggers #{:init}
:reaction (fn [this]
(when (platform/mac?)
(set! (.-menu app/win) nil)
(set! (.-Menu app/win) nil)
)
(main-menu)))

Expand Down
7 changes: 4 additions & 3 deletions src/lt/objs/platform.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
(def electron true)

(def fs (js/require "fs"))
(def clipboard (js/require "clipboard"))
(def electron-shell (js/require "shell"))
(def remote (.-remote (js/require "electron")))
(def clipboard (.-clipboard (js/require "electron")))
(def electron-shell (.-shell (js/require "electron")))

(defn get-data-path []
(.getData (.require (js/require "remote") "app")))
(.getAppPath (.-app remote)))

(defn normalize [plat]
(condp = plat
Expand Down
3 changes: 1 addition & 2 deletions src/lt/util/ipc.cljs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
(ns lt.util.ipc
"Util functions for the ipc renderer - https://github.com/atom/electron/blob/master/docs/api/ipc-renderer.md")

(def electron (js/require "electron"))
(def ipc "Provides access to the ipc renderer." (.-ipcRenderer electron))
(def ipc "Provides access to the ipc renderer." (.-ipcRenderer (js/require "electron")))

;; `send` and `on` are declared here with their bodies defined later as otherwise Codox will use the
;; redefined `send` and `on` in the below when block instead.
Expand Down

0 comments on commit 85bc3fd

Please sign in to comment.