Commit graph

2619 commits

Author SHA1 Message Date
LaShonda Hopper
3ee9d8b766 [Worklist #21420] Ran lint on edit script (details below).
Prior to and after addressing Worklist Item #21420, it was observed that the
tool bar buttons popping in and out during load.  Taking a while to become visible.

Ran JSHint on the edit.js script to see if something stood out.

Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing.  This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.

JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons

PreFix:  51 JSHint issues detected
PostFix: 0 JSHint issues detected.

Changes to be committed:
	modified:   scripts/system/edit.js
2017-07-10 12:23:28 -04:00
LaShonda Hopper
85111131da [Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below).
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	modified:   interface/src/Application.cpp
	modified:   scripts/system/edit.js
2017-07-06 15:27:15 -04:00
LaShonda Hopper
9cae868492 [Worklist #21420] Implement Create button disabled state (details below).
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.

* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.

* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	new file:   interface/resources/icons/tablet-icons/edit-disabled.svg
	modified:   scripts/system/edit.js
2017-07-06 10:53:46 -04:00
Zach Fox
6f2e7f5b83 Tweak the Snapshot 'Share' button to make its purpose more clear 2017-07-05 12:39:15 -07:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
Brad Davis
3f48c7aef5 Merge pull request #10855 from jherico/snapshot
Fix snapshot connection errors
2017-06-30 12:58:48 -07:00
utkarshgautamnyu
82597ac424 Update snapshot.js 2017-06-30 10:22:05 -07:00
Brad Davis
6e5eff9407 Fix snapshot connection errors 2017-06-29 10:01:48 -07:00
utkarshgautamnyu
e6be838e79 Update snapshot.js 2017-06-28 15:30:49 -07:00
Brad Davis
de88a34e97 Fix toolbar button activation states 2017-06-26 23:33:32 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
David Rowe
bed0e8ef87 Merge branch 'master' into 21396
# Conflicts:
#	interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
David Rowe
6543b74b52 Add beeps 2017-06-24 14:26:01 +12:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-22 13:35:05 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386
Fixed a bug where you could not print polaroids if you took a gif
2017-06-16 15:03:45 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324
Reworked Particle Editor UI
2017-06-13 13:00:54 -07:00
Matti Lahtinen
35f83afd09 Removed unneccessary print 2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Seth Alves
92fe8145be Merge pull request #10616 from vladest/create_button_sticked
Set active button property isActive before Home menu redraw. Makes su…
2017-06-11 13:43:41 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes
Add additional primitive shapes
2017-06-09 19:02:54 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345
Position tablet relative to hand
2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Seth Alves
759a87c27e Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts
Move chat app to run with default scripts
2017-06-08 20:26:34 -07:00
Liv Erickson
6657c4d997 Update chat.js
remove stray semicolon
2017-06-08 17:22:18 -07:00
Seth Alves
d87b858c0a Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue
4869 entity resize issue
2017-06-08 16:34:07 -07:00
Seth Alves
9fa74029c7 Merge pull request #10633 from mnafees/21299
CR for Job #21299 - Save category on Marketplace when using back button
2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b Fix intendantion 2017-06-08 22:58:40 +02:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00