Merge branch 'open1392b' into open-master

This commit is contained in:
Victor Woeltjen
2015-06-29 16:30:48 -07:00
23 changed files with 573 additions and 531 deletions

View File

@@ -94,18 +94,20 @@
"key": "window",
"name": "Open in a new tab",
"implementation": "windowing/NewTabAction.js",
"description": "Open this object in a new tab",
"description": "Open in a new browser tab",
"category": ["view-control", "contextual"],
"depends": [ "urlService", "$window" ],
"group": "windowing",
"glyph": "y"
"glyph": "y",
"priority": "preferred"
},
{
"key": "fullscreen",
"implementation": "windowing/FullscreenAction.js",
"category": "view-control",
"group": "windowing",
"glyph": "z"
"glyph": "z",
"priority": "default"
}
],
"views": [

View File

@@ -29,8 +29,8 @@ define(
function () {
"use strict";
var ENTER_FULLSCREEN = "Enter full screen mode.",
EXIT_FULLSCREEN = "Exit full screen mode.";
var ENTER_FULLSCREEN = "Enter full screen mode",
EXIT_FULLSCREEN = "Exit full screen mode";
/**
* The fullscreen action toggles between fullscreen display