Updated zero.clipboard to fix copy to clipboard function for requirejs.

Removed wrapper function.

src/UI/Mixins/CopyToClipboard.js

@@ -3,17 +3,20 @@ var StatusModel = require('../System/StatusModel');
 var ZeroClipboard = require('zero.clipboard');
 var Messenger = require('../Shared/Messenger');
 
-module.exports = (function(){
-    $.fn.copyToClipboard = function(input){
-        var moviePath = StatusModel.get('urlBase') + '/Content/zero.clipboard.swf';
-        var client = new ZeroClipboard(this, {moviePath : moviePath});
-        client.on('load', function(client){
-            client.on('dataRequested', function(client){
-                client.setText(input.val());
-            });
-            client.on('complete', function(){
-                Messenger.show({message : 'Copied text to clipboard'});
-            });
+$.fn.copyToClipboard = function(input) {
+
+    ZeroClipboard.config({
+        swfPath: StatusModel.get('urlBase') + '/Content/zero.clipboard.swf'
+    });
+
+    var client = new ZeroClipboard(this);
+
+    client.on('ready', function(e) {
+        client.on('copy', function(e) {
+            e.clipboardData.setData("text/plain", input.val());
+        });
+        client.on('aftercopy', function() {
+            Messenger.show({message : 'Copied text to clipboard'});
         });
-    };
-}).call(this);
+    });
+};

src/UI/Settings/General/GeneralView.js

@@ -1,123 +1,121 @@
-'use strict';
-define(
-    [
-        'vent',
-        'marionette',
-        'Commands/CommandController',
-        'Mixins/AsModelBoundView',
-        'Mixins/AsValidatedView',
-        'Mixins/CopyToClipboard'
-    ], function (vent, Marionette, CommandController, AsModelBoundView, AsValidatedView) {
-        var view = Marionette.ItemView.extend({
-            template: 'Settings/General/GeneralViewTemplate',
-
-            events: {
-                'change .x-auth'             : '_setAuthOptionsVisibility',
-                'change .x-ssl'              : '_setSslOptionsVisibility',
-                'click .x-reset-api-key'     : '_resetApiKey',
-                'change .x-update-mechanism' : '_setScriptGroupVisibility'
-            },
-
-            ui: {
-                authToggle      : '.x-auth',
-                authOptions     : '.x-auth-options',
-                sslToggle       : '.x-ssl',
-                sslOptions      : '.x-ssl-options',
-                resetApiKey     : '.x-reset-api-key',
-                copyApiKey      : '.x-copy-api-key',
-                apiKeyInput     : '.x-api-key',
-                updateMechanism : '.x-update-mechanism',
-                scriptGroup     : '.x-script-group'
-            },
-
-            initialize: function () {
-                this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
-            },
-
-            onRender: function(){
-                if(this.ui.authToggle.val() === 'none'){
-                    this.ui.authOptions.hide();
-                }
-
-                if(!this.ui.sslToggle.prop('checked')){
-                    this.ui.sslOptions.hide();
-                }
-
-                if (!this._showScriptGroup()) {
-                    this.ui.scriptGroup.hide();
-                }
-
-                CommandController.bindToCommand({
-                    element: this.ui.resetApiKey,
-                    command: {
-                        name: 'resetApiKey'
-                    }
-                });
-            },
-
-            onShow: function () {
-                this.ui.copyApiKey.copyToClipboard(this.ui.apiKeyInput);
-            },
-
-            _setAuthOptionsVisibility: function () {
-
-                var showAuthOptions = this.ui.authToggle.val() !== 'none';
-
-                if (showAuthOptions) {
-                    this.ui.authOptions.slideDown();
-                }
-
-                else {
-                    this.ui.authOptions.slideUp();
-                }
-            },
-
-            _setSslOptionsVisibility: function () {
-
-                var showSslOptions = this.ui.sslToggle.prop('checked');
-
-                if (showSslOptions) {
-                    this.ui.sslOptions.slideDown();
-                }
-
-                else {
-                    this.ui.sslOptions.slideUp();
-                }
-            },
-
-            _resetApiKey: function () {
-                if (window.confirm('Reset API Key?')) {
-                    CommandController.Execute('resetApiKey', {
-                        name : 'resetApiKey'
-                    });
-                }
-            },
-
-            _commandComplete: function (options) {
-                if (options.command.get('name') === 'resetapikey') {
-                    this.model.fetch();
-                }
-            },
-
-            _setScriptGroupVisibility: function () {
-
-                if (this._showScriptGroup()) {
-                    this.ui.scriptGroup.slideDown();
-                }
-
-                else {
-                    this.ui.scriptGroup.slideUp();
-                }
-            },
-
-            _showScriptGroup: function () {
-                return this.ui.updateMechanism.val() === 'script';
+
+var vent = require('../../vent');
+var Marionette = require('marionette');
+var CommandController = require('../../Commands/CommandController');
+var AsModelBoundView = require('../../Mixins/AsModelBoundView');
+var AsValidatedView = require('../../Mixins/AsValidatedView');
+
+require('../../Mixins/CopyToClipboard');
+
+var view = Marionette.ItemView.extend({
+    template: 'Settings/General/GeneralViewTemplate',
+
+    events: {
+        'change .x-auth'             : '_setAuthOptionsVisibility',
+        'change .x-ssl'              : '_setSslOptionsVisibility',
+        'click .x-reset-api-key'     : '_resetApiKey',
+        'change .x-update-mechanism' : '_setScriptGroupVisibility'
+    },
+
+    ui: {
+        authToggle      : '.x-auth',
+        authOptions     : '.x-auth-options',
+        sslToggle       : '.x-ssl',
+        sslOptions      : '.x-ssl-options',
+        resetApiKey     : '.x-reset-api-key',
+        copyApiKey      : '.x-copy-api-key',
+        apiKeyInput     : '.x-api-key',
+        updateMechanism : '.x-update-mechanism',
+        scriptGroup     : '.x-script-group'
+    },
+
+    initialize: function () {
+        this.listenTo(vent, vent.Events.CommandComplete, this._commandComplete);
+    },
+
+    onRender: function(){
+        if(this.ui.authToggle.val() === 'none'){
+            this.ui.authOptions.hide();
+        }
+
+        if(!this.ui.sslToggle.prop('checked')){
+            this.ui.sslOptions.hide();
+        }
+
+        if (!this._showScriptGroup()) {
+            this.ui.scriptGroup.hide();
+        }
+
+        CommandController.bindToCommand({
+            element: this.ui.resetApiKey,
+            command: {
+                name: 'resetApiKey'
             }
         });
+    },
 
-        AsModelBoundView.call(view);
-        AsValidatedView.call(view);
+    onShow: function () {
+        this.ui.copyApiKey.copyToClipboard(this.ui.apiKeyInput);
+    },
 
-        return view;
-    });
+    _setAuthOptionsVisibility: function () {
+
+        var showAuthOptions = this.ui.authToggle.val() !== 'none';
+
+        if (showAuthOptions) {
+            this.ui.authOptions.slideDown();
+        }
+
+        else {
+            this.ui.authOptions.slideUp();
+        }
+    },
+
+    _setSslOptionsVisibility: function () {
+
+        var showSslOptions = this.ui.sslToggle.prop('checked');
+
+        if (showSslOptions) {
+            this.ui.sslOptions.slideDown();
+        }
+
+        else {
+            this.ui.sslOptions.slideUp();
+        }
+    },
+
+    _resetApiKey: function () {
+        if (window.confirm('Reset API Key?')) {
+            CommandController.Execute('resetApiKey', {
+                name : 'resetApiKey'
+            });
+        }
+    },
+
+    _commandComplete: function (options) {
+        if (options.command.get('name') === 'resetapikey') {
+            this.model.fetch();
+        }
+    },
+
+    _setScriptGroupVisibility: function () {
+
+        if (this._showScriptGroup()) {
+            this.ui.scriptGroup.slideDown();
+        }
+
+        else {
+            this.ui.scriptGroup.slideUp();
+        }
+    },
+
+    _showScriptGroup: function () {
+        return this.ui.updateMechanism.val() === 'script';
+    }
+});
+
+AsModelBoundView.call(view);
+AsValidatedView.call(view);
+
+module.exports = view;