Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
panustaja
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Mihkel Putrinš
panustaja
Commits
06a3010b
Commit
06a3010b
authored
Nov 10, 2015
by
Mihkel Putrinš
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use clipboard instead of intermediate file
parent
1f3cf0f6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
55 deletions
+35
-55
code/app.js
code/app.js
+11
-28
code/main.jade
code/main.jade
+2
-2
code/main.js
code/main.js
+22
-25
code/style.css
code/style.css
+0
-0
No files found.
code/app.js
View file @
06a3010b
...
@@ -3,6 +3,7 @@ var op = require('object-path')
...
@@ -3,6 +3,7 @@ var op = require('object-path')
var
path
=
require
(
'
path
'
)
var
path
=
require
(
'
path
'
)
var
fs
=
require
(
'
fs
'
)
var
fs
=
require
(
'
fs
'
)
var
ipc
=
require
(
'
ipc
'
)
var
ipc
=
require
(
'
ipc
'
)
var
clipboard
=
require
(
'
clipboard
'
)
var
j
=
require
(
'
electron-jade
'
)({
pretty
:
true
},
{})
var
j
=
require
(
'
electron-jade
'
)({
pretty
:
true
},
{})
var
BrowserWindow
=
require
(
'
browser-window
'
)
var
BrowserWindow
=
require
(
'
browser-window
'
)
...
@@ -41,38 +42,20 @@ app.on('ready', function() {
...
@@ -41,38 +42,20 @@ app.on('ready', function() {
windows
[
'
authWindow
'
].
setTitle
(
title
)
windows
[
'
authWindow
'
].
setTitle
(
title
)
var
new_url
=
windows
[
'
authWindow
'
].
webContents
.
getUrl
()
var
new_url
=
windows
[
'
authWindow
'
].
webContents
.
getUrl
()
if
(
new_url
===
user_url
||
new_url
===
user_url
+
'
#
'
)
{
if
(
new_url
===
user_url
||
new_url
===
user_url
+
'
#
'
)
{
clipboard
.
clear
()
windows
[
'
authWindow
'
].
webContents
.
selectAll
()
windows
[
'
authWindow
'
].
webContents
.
copy
()
mainWindow
=
new
BrowserWindow
({
width
:
900
,
height
:
600
,
show
:
true
})
mainWindow
=
new
BrowserWindow
({
width
:
900
,
height
:
600
,
show
:
true
})
mainWindow
.
setTitle
(
'
Panustaja
'
)
mainWindow
.
setTitle
(
'
Panustaja
'
)
mainWindow
.
center
()
mainWindow
.
center
()
// require('dialog').showMessageBox({type:'info', message:'OK\n"' + windows['authWindow'].webContents.getUrl() + '"'
var
view_path
=
path
.
join
(
app
.
getAppPath
(),
'
code
'
,
'
main.jade
'
)
// + '\n==='
// + '\n"' + user_url + '"'
// , buttons:['ok']
// })
// console.log(windows['authWindow'].webContents.session.cookies);
windows
[
'
authWindow
'
].
webContents
.
savePage
(
USER_PATH
,
'
HTMLOnly
'
,
function
(
err
)
{
if
(
err
)
{
require
(
'
dialog
'
).
showMessageBox
({
type
:
'
info
'
,
message
:
'
peale salvestamist: katki
'
+
err
,
buttons
:[
'
ok
'
]})
console
.
log
(
"
Error:
"
,
err
)
process
.
exit
()
}
else
{
var
view_path
=
path
.
join
(
app
.
getAppPath
(),
'
code
'
,
'
views
'
,
'
main.jade
'
)
// require('dialog').showMessageBox({type:'info', message:'peale salvestamist: korras\n'
// + 'Laen lehte: file://' + view_path, buttons:['ok']})
mainWindow
.
webContents
.
loadUrl
(
'
file://
'
+
view_path
)
mainWindow
.
webContents
.
loadUrl
(
'
file://
'
+
view_path
)
windows
[
'
authWindow
'
].
hide
()
windows
[
'
authWindow
'
].
hide
()
if
(
IS_DEV
)
{
if
(
IS_DEV
)
{
mainWindow
.
webContents
.
openDevTools
(
true
)
mainWindow
.
webContents
.
openDevTools
(
true
)
}
}
// require('dialog').showMessageBox({type:'info', message:'fail suletud: ' + USER_PATH, buttons:['ok']})
}
})
}
else
{
}
else
{
// require('dialog').showMessageBox({type:'info', message:'"' + new_url + '"'
// + '\n!=='
// + '\n"' + user_url + '"'
// , buttons:['ok']
// })
return
return
}
}
})
})
...
...
code/
views/
main.jade
→
code/main.jade
View file @
06a3010b
...
@@ -2,7 +2,7 @@ doctype html
...
@@ -2,7 +2,7 @@ doctype html
html
html
head
head
meta(charset='utf-8')
meta(charset='utf-8')
link(rel='stylesheet', type='text/css', href='.
./style
/style.css')
link(rel='stylesheet', type='text/css', href='./style.css')
link(rel='icon' type='image/png', href='/favicon-96x96.png' sizes='96x96')
link(rel='icon' type='image/png', href='/favicon-96x96.png' sizes='96x96')
link(rel='shortcut icon', href='/favicon.ico')
link(rel='shortcut icon', href='/favicon.ico')
...
@@ -41,4 +41,4 @@ html
...
@@ -41,4 +41,4 @@ html
pre#status
pre#status
div#thankYou(hidden='') Aitäh!
div#thankYou(hidden='') Aitäh!
script(src='.
.
/main.js')
script(src='./main.js')
code/main.js
View file @
06a3010b
...
@@ -11,14 +11,15 @@ var magic = new Magic(mmm.MAGIC_MIME_TYPE | mmm.MAGIC_MIME_ENCODING)
...
@@ -11,14 +11,15 @@ var magic = new Magic(mmm.MAGIC_MIME_TYPE | mmm.MAGIC_MIME_ENCODING)
var
remote
=
require
(
'
remote
'
)
var
remote
=
require
(
'
remote
'
)
var
app
=
remote
.
require
(
'
app
'
)
var
app
=
remote
.
require
(
'
app
'
)
var
dialog
=
remote
.
require
(
'
dialog
'
)
var
dialog
=
remote
.
require
(
'
dialog
'
)
var
clipboard
=
remote
.
require
(
'
clipboard
'
)
// console.log(path.join(__dirname)) ==> panustaja/code/views
// console.log(path.join(__dirname)) ==> panustaja/code/views
var
pjson
=
require
(
path
.
join
(
__dirname
,
'
..
'
,
'
..
'
,
'
package.json
'
))
var
pjson
=
require
(
path
.
join
(
__dirname
,
'
..
'
,
'
package.json
'
))
UPLOADER_VERSION
=
pjson
.
name
+
'
v.
'
+
pjson
.
version
+
(
pjson
.
version
.
indexOf
(
'
-
'
)
>
-
1
?
pjson
.
build
:
''
)
UPLOADER_VERSION
=
pjson
.
name
+
'
v.
'
+
pjson
.
version
+
(
pjson
.
version
.
indexOf
(
'
-
'
)
>
-
1
?
pjson
.
build
:
''
)
var
ipc
=
require
(
'
ipc
'
)
var
ipc
=
require
(
'
ipc
'
)
var
b2s
=
require
(
path
.
join
(
__dirname
,
'
..
'
,
'
bytesToSize.js
'
))
var
b2s
=
require
(
path
.
join
(
__dirname
,
'
bytesToSize.js
'
))
var
user_data
=
{}
var
user_data
=
{}
var
resource
=
{}
var
resource
=
{}
...
@@ -27,13 +28,8 @@ var dom_resource_name = document.getElementById('resourceNameInput')
...
@@ -27,13 +28,8 @@ var dom_resource_name = document.getElementById('resourceNameInput')
var
dom_resource_stats
=
document
.
getElementById
(
'
resourceStats
'
)
var
dom_resource_stats
=
document
.
getElementById
(
'
resourceStats
'
)
var
renderer_interval
var
renderer_interval
setTimeout
(
function
()
{
var
initialize
=
function
initialize
()
{
USER_PATH
=
path
.
join
(
app
.
getPath
(
'
temp
'
),
'
user.json
'
)
var
data
=
JSON
.
parse
(
clipboard
.
readText
())
fs
.
readFile
(
USER_PATH
,
'
utf8
'
,
function
(
err
,
data_json
)
{
if
(
err
)
throw
(
err
)
// dialog.showMessageBox({type:'info', message:'fail avatud: ' + USER_PATH, buttons:['ok']})
// dialog.showMessageBox({type:'info', message:data_json, buttons:['ok']})
var
data
=
JSON
.
parse
(
data_json
)
if
(
op
.
get
(
data
,
'
result.user_id
'
,
false
))
{
if
(
op
.
get
(
data
,
'
result.user_id
'
,
false
))
{
user_data
[
'
user_id
'
]
=
op
.
get
(
data
,
'
result.user_id
'
)
user_data
[
'
user_id
'
]
=
op
.
get
(
data
,
'
result.user_id
'
)
user_data
[
'
session_key
'
]
=
op
.
get
(
data
,
'
result.session_key
'
)
user_data
[
'
session_key
'
]
=
op
.
get
(
data
,
'
result.session_key
'
)
...
@@ -47,8 +43,7 @@ setTimeout(function () {
...
@@ -47,8 +43,7 @@ setTimeout(function () {
ipc
.
send
(
'
data
'
,
data
)
ipc
.
send
(
'
data
'
,
data
)
}
}
ipc
.
send
(
'
closeAuth
'
)
ipc
.
send
(
'
closeAuth
'
)
})
}
},
10
)
function
selectLocal
()
{
function
selectLocal
()
{
resource
=
{
name
:
'
root
'
}
resource
=
{
name
:
'
root
'
}
...
@@ -163,7 +158,7 @@ var recurseLocal = function recurseLocal(parent_resource, paths, loadedCB) {
...
@@ -163,7 +158,7 @@ var recurseLocal = function recurseLocal(parent_resource, paths, loadedCB) {
})
})
}
}
var
uploadResource
=
require
(
path
.
join
(
__dirname
,
'
..
'
,
'
upload.js
'
))
var
uploadResource
=
require
(
path
.
join
(
__dirname
,
'
upload.js
'
))
var
setFormState
=
function
setFormState
(
state
)
{
var
setFormState
=
function
setFormState
(
state
)
{
switch
(
state
)
{
switch
(
state
)
{
...
@@ -219,3 +214,5 @@ var setFormState = function setFormState(state) {
...
@@ -219,3 +214,5 @@ var setFormState = function setFormState(state) {
break
break
}
}
}
}
initialize
()
code/style
/style
.css
→
code/style.css
View file @
06a3010b
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment